diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index fb2c0a6a49..ee12933830 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -22,11 +22,9 @@ endif(BUILD_GUI)
 SET(FemScripts_SRCS
     Init.py
     InitGui.py
-    FemConstraint.py
     FemUtils.py
     ObjectsFem.py
     TestFem.py
-    ViewProviderFemConstraint.py
 )
 
 SET(FemCommands_SRCS
@@ -178,6 +176,7 @@ SET(FemObjectsScripts_SRCS
     PyObjects/_FemMeshResult.py
     PyObjects/_FemResultMechanical.py
     PyObjects/_FemSolverCalculix.py
+    PyObjects/FemConstraint.py
 )
 
 SET(FemAllScripts
@@ -250,6 +249,7 @@ SET(FemGuiScripts_SRCS
     PyGui/_ViewProviderFemSolverCalculix.py
     PyGui/FemSelectionObserver.py
     PyGui/FemSelectionWidgets.py
+    PyGui/ViewProviderFemConstraint.py
 )
 
 
diff --git a/src/Mod/Fem/ViewProviderFemConstraint.py b/src/Mod/Fem/PyGui/ViewProviderFemConstraint.py
similarity index 100%
rename from src/Mod/Fem/ViewProviderFemConstraint.py
rename to src/Mod/Fem/PyGui/ViewProviderFemConstraint.py
diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintBodyHeatSource.py b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintBodyHeatSource.py
index a157166225..93e0fb6724 100644
--- a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintBodyHeatSource.py
+++ b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintBodyHeatSource.py
@@ -26,7 +26,7 @@ __author__ = "Markus Hovorka, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
 
-import ViewProviderFemConstraint
+from . import ViewProviderFemConstraint
 
 
 class ViewProxy(ViewProviderFemConstraint.ViewProxy):
diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintElectrostaticPotential.py b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintElectrostaticPotential.py
index 8085ff75d9..0dd8624821 100644
--- a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintElectrostaticPotential.py
+++ b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintElectrostaticPotential.py
@@ -28,7 +28,7 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD as App
 import FemUtils
-import ViewProviderFemConstraint
+from . import ViewProviderFemConstraint
 from FreeCAD import Units
 
 import FreeCADGui as Gui
diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py
index 439c80a815..ad1e255e2f 100644
--- a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py
+++ b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintFlowVelocity.py
@@ -28,7 +28,7 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD as App
 import FemUtils
-import ViewProviderFemConstraint
+from . import ViewProviderFemConstraint
 from FreeCAD import Units
 
 import FreeCADGui as Gui
diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py
index 831948621d..1e6a774e34 100644
--- a/src/Mod/Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py
+++ b/src/Mod/Fem/PyGui/_ViewProviderFemConstraintInitialFlowVelocity.py
@@ -28,7 +28,7 @@ __url__ = "http://www.freecadweb.org"
 
 import FreeCAD as App
 import FemUtils
-import ViewProviderFemConstraint
+from . import ViewProviderFemConstraint
 from FreeCAD import Units
 
 import FreeCADGui as Gui
diff --git a/src/Mod/Fem/FemConstraint.py b/src/Mod/Fem/PyObjects/FemConstraint.py
similarity index 100%
rename from src/Mod/Fem/FemConstraint.py
rename to src/Mod/Fem/PyObjects/FemConstraint.py
diff --git a/src/Mod/Fem/PyObjects/_FemConstraintBodyHeatSource.py b/src/Mod/Fem/PyObjects/_FemConstraintBodyHeatSource.py
index ba4fa5d848..fb7c38f0e3 100644
--- a/src/Mod/Fem/PyObjects/_FemConstraintBodyHeatSource.py
+++ b/src/Mod/Fem/PyObjects/_FemConstraintBodyHeatSource.py
@@ -26,7 +26,7 @@ __author__ = "Markus Hovorka, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
 
-import FemConstraint
+from . import FemConstraint
 
 
 class Proxy(FemConstraint.Proxy):
diff --git a/src/Mod/Fem/PyObjects/_FemConstraintElectrostaticPotential.py b/src/Mod/Fem/PyObjects/_FemConstraintElectrostaticPotential.py
index ca79cb3e8f..31dc1ab135 100644
--- a/src/Mod/Fem/PyObjects/_FemConstraintElectrostaticPotential.py
+++ b/src/Mod/Fem/PyObjects/_FemConstraintElectrostaticPotential.py
@@ -26,7 +26,7 @@ __author__ = "Markus Hovorka, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
 
-import FemConstraint
+from . import FemConstraint
 
 
 class Proxy(FemConstraint.Proxy):
diff --git a/src/Mod/Fem/PyObjects/_FemConstraintFlowVelocity.py b/src/Mod/Fem/PyObjects/_FemConstraintFlowVelocity.py
index 80b3e5a566..c483fb071e 100644
--- a/src/Mod/Fem/PyObjects/_FemConstraintFlowVelocity.py
+++ b/src/Mod/Fem/PyObjects/_FemConstraintFlowVelocity.py
@@ -26,7 +26,7 @@ __author__ = "Markus Hovorka, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
 
-import FemConstraint
+from . import FemConstraint
 
 
 class Proxy(FemConstraint.Proxy):
diff --git a/src/Mod/Fem/PyObjects/_FemConstraintInitialFlowVelocity.py b/src/Mod/Fem/PyObjects/_FemConstraintInitialFlowVelocity.py
index 59b09571e5..d5e44ab10f 100644
--- a/src/Mod/Fem/PyObjects/_FemConstraintInitialFlowVelocity.py
+++ b/src/Mod/Fem/PyObjects/_FemConstraintInitialFlowVelocity.py
@@ -26,7 +26,7 @@ __author__ = "Markus Hovorka, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
 
-import FemConstraint
+from . import FemConstraint
 
 
 class Proxy(FemConstraint.Proxy):