diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt
index fce6bdd8f9..0d739b5333 100644
--- a/src/Mod/Path/CMakeLists.txt
+++ b/src/Mod/Path/CMakeLists.txt
@@ -30,10 +30,18 @@ SET(PathPython_SRCS
     Path/Log.py
 )
 
+SET(PathPythonOp_SRCS
+    Path/Op/__init__.py
+    Path/Op/Adaptive.py
+)
+
+SET(PathPythonOpGui_SRCS
+    Path/Op/Gui/__init__.py
+    Path/Op/Gui/Adaptive.py
+)
+
 SET(PathScripts_SRCS
     PathScripts/drillableLib.py
-    PathScripts/PathAdaptive.py
-    PathScripts/PathAdaptiveGui.py
     PathScripts/PathAreaOp.py
     PathScripts/PathArray.py
     PathScripts/PathCircularHoleBase.py
@@ -318,6 +326,8 @@ SET(Path_Data
 SET(all_files
     ${PathScripts_SRCS}
     ${PathPython_SRCS}
+    ${PathPythonOp_SRCS}
+    ${PathPythonOpGui_SRCS}
     ${Generator_SRCS}
     ${PathScripts_post_SRCS}
     ${PathPythonGui_SRCS}
@@ -359,6 +369,19 @@ INSTALL(
         Mod/Path/Path
 )
 
+INSTALL(
+    FILES
+        ${PathPythonOp_SRCS}
+    DESTINATION
+        Mod/Path/Path/Op
+)
+INSTALL(
+    FILES
+        ${PathPythonOpGui_SRCS}
+    DESTINATION
+        Mod/Path/Path/Op/Gui
+)
+
 INSTALL(
     FILES
         ${Generator_SRCS}
diff --git a/src/Mod/Path/PathScripts/PathAdaptive.py b/src/Mod/Path/Path/Op/Adaptive.py
similarity index 100%
rename from src/Mod/Path/PathScripts/PathAdaptive.py
rename to src/Mod/Path/Path/Op/Adaptive.py
diff --git a/src/Mod/Path/PathScripts/PathAdaptiveGui.py b/src/Mod/Path/Path/Op/Gui/Adaptive.py
similarity index 99%
rename from src/Mod/Path/PathScripts/PathAdaptiveGui.py
rename to src/Mod/Path/Path/Op/Gui/Adaptive.py
index 4b42a2fd92..a4836b1dd0 100644
--- a/src/Mod/Path/PathScripts/PathAdaptiveGui.py
+++ b/src/Mod/Path/Path/Op/Gui/Adaptive.py
@@ -21,9 +21,9 @@
 # *                                                                         *
 # ***************************************************************************
 
+import Path.Op.Adaptive as PathAdaptive
 import PathScripts.PathOpGui as PathOpGui
 from PySide import QtCore
-import PathScripts.PathAdaptive as PathAdaptive
 import PathScripts.PathFeatureExtensionsGui as PathFeatureExtensionsGui
 import FreeCADGui
 
diff --git a/src/Mod/Path/Path/Op/Gui/__init__.py b/src/Mod/Path/Path/Op/Gui/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Mod/Path/Path/Op/__init__.py b/src/Mod/Path/Path/Op/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Mod/Path/PathScripts/PathGuiInit.py b/src/Mod/Path/PathScripts/PathGuiInit.py
index 59a448f58b..19bf366369 100644
--- a/src/Mod/Path/PathScripts/PathGuiInit.py
+++ b/src/Mod/Path/PathScripts/PathGuiInit.py
@@ -38,7 +38,7 @@ def Startup():
     global Processed
     if not Processed:
         Path.Log.debug("Initializing PathGui")
-        from PathScripts import PathAdaptiveGui
+        from Path.Op.Gui import Adaptive
         from PathScripts import PathArray
         from PathScripts import PathComment
         from PathScripts import PathCustomGui
diff --git a/src/Mod/Path/PathTests/TestPathAdaptive.py b/src/Mod/Path/PathTests/TestPathAdaptive.py
index caac814be1..12fb52f546 100644
--- a/src/Mod/Path/PathTests/TestPathAdaptive.py
+++ b/src/Mod/Path/PathTests/TestPathAdaptive.py
@@ -24,13 +24,13 @@
 
 import FreeCAD
 import Part
+import Path.Op.Adaptive as PathAdaptive
 import PathScripts.PathJob as PathJob
-import PathScripts.PathAdaptive as PathAdaptive
 import PathScripts.PathGeom as PathGeom
 from PathTests.PathTestUtils import PathTestBase
 
 if FreeCAD.GuiUp:
-    import PathScripts.PathAdaptiveGui as PathAdaptiveGui
+    import Path.Op.Gui.Adaptive as PathAdaptiveGui
     import PathScripts.PathJobGui as PathJobGui