diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index 77368eb174..fb2c0a6a49 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -26,6 +26,7 @@ SET(FemScripts_SRCS
     FemUtils.py
     ObjectsFem.py
     TestFem.py
+    ViewProviderFemConstraint.py
 )
 
 SET(FemCommands_SRCS
diff --git a/src/Mod/Fem/FemConstraint.py b/src/Mod/Fem/FemConstraint.py
index 38b981b9a5..f80436f4f0 100644
--- a/src/Mod/Fem/FemConstraint.py
+++ b/src/Mod/Fem/FemConstraint.py
@@ -37,25 +37,3 @@ class Proxy(object):
 
     def __init__(self, obj):
         obj.Proxy = self
-
-
-class ViewProxy(object):
-    """Proxy for FemSolverElmers View Provider."""
-
-    def __init__(self, vobj):
-        vobj.Proxy = self
-
-    def attach(self, vobj):
-        default = coin.SoGroup()
-        vobj.addDisplayMode(default, "Default")
-
-    def getDisplayModes(self, obj):
-        "Return a list of display modes."
-        modes = ["Default"]
-        return modes
-
-    def getDefaultDisplayMode(self):
-        return "Default"
-
-    def setDisplayMode(self, mode):
-        return mode
diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintBodyHeatSource.py b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintBodyHeatSource.py
index 8d091f2ef0..a157166225 100644
--- a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintBodyHeatSource.py
+++ b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintBodyHeatSource.py
@@ -26,10 +26,10 @@ __author__ = "Markus Hovorka, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
 
-import FemConstraint
+import ViewProviderFemConstraint
 
 
-class ViewProxy(FemConstraint.ViewProxy):
+class ViewProxy(ViewProviderFemConstraint.ViewProxy):
 
     def getIcon(self):
         return ":/icons/fem-constraint-heatflux.svg"
diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintElectrostaticPotential.py b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintElectrostaticPotential.py
index aaa919098a..8085ff75d9 100644
--- a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintElectrostaticPotential.py
+++ b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintElectrostaticPotential.py
@@ -28,14 +28,14 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD as App
 import FemUtils
-import FemConstraint
+import ViewProviderFemConstraint
 from FreeCAD import Units
 
 import FreeCADGui as Gui
 from . import FemSelectionWidgets
 
 
-class ViewProxy(FemConstraint.ViewProxy):
+class ViewProxy(ViewProviderFemConstraint.ViewProxy):
 
     def getIcon(self):
         return ":/icons/fem-constraint-electrostatic-potential.svg"
diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py
index 24293946c6..439c80a815 100644
--- a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py
+++ b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py
@@ -28,14 +28,14 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD as App
 import FemUtils
-import FemConstraint
+import ViewProviderFemConstraint
 from FreeCAD import Units
 
 import FreeCADGui as Gui
 from . import FemSelectionWidgets
 
 
-class ViewProxy(FemConstraint.ViewProxy):
+class ViewProxy(ViewProviderFemConstraint.ViewProxy):
 
     def getIcon(self):
         return ":/icons/fem-constraint-flow-velocity.svg"
diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py
index e431f7f734..831948621d 100644
--- a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py
+++ b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py
@@ -28,13 +28,13 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD as App
 import FemUtils
-import FemConstraint
+import ViewProviderFemConstraint
 from FreeCAD import Units
 
 import FreeCADGui as Gui
 
 
-class ViewProxy(FemConstraint.ViewProxy):
+class ViewProxy(ViewProviderFemConstraint.ViewProxy):
 
     def getIcon(self):
         return ":/icons/fem-constraint-initial-flow-velocity.svg"
diff --git a/src/Mod/Fem/ViewProviderFemConstraint.py b/src/Mod/Fem/ViewProviderFemConstraint.py
new file mode 100644
index 0000000000..558822fcad
--- /dev/null
+++ b/src/Mod/Fem/ViewProviderFemConstraint.py
@@ -0,0 +1,53 @@
+# ***************************************************************************
+# *                                                                         *
+# *   Copyright (c) 2017 - Markus Hovorka <m.hovorka@live.de>               *
+# *                                                                         *
+# *   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__ = "_Base ViewProvider"
+__author__ = "Markus Hovorka"
+__url__ = "http://www.freecadweb.org"
+
+
+import FreeCAD
+if FreeCAD.GuiUp:
+    from pivy import coin
+
+
+class ViewProxy(object):
+    """Proxy for FemSolverElmers View Provider."""
+
+    def __init__(self, vobj):
+        vobj.Proxy = self
+
+    def attach(self, vobj):
+        default = coin.SoGroup()
+        vobj.addDisplayMode(default, "Default")
+
+    def getDisplayModes(self, obj):
+        "Return a list of display modes."
+        modes = ["Default"]
+        return modes
+
+    def getDefaultDisplayMode(self):
+        return "Default"
+
+    def setDisplayMode(self, mode):
+        return mode