diff --git a/src/Mod/Draft/CMakeLists.txt b/src/Mod/Draft/CMakeLists.txt
index 3dd3159dfa..e78a974f14 100644
--- a/src/Mod/Draft/CMakeLists.txt
+++ b/src/Mod/Draft/CMakeLists.txt
@@ -60,6 +60,7 @@ SET(Draft_utilities
 
 SET(Draft_functions
     draftfunctions/__init__.py
+    draftfunctions/draftify.py
     draftfunctions/fuse.py
     draftfunctions/heal.py
     draftfunctions/join.py
diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
index 5ff81227b7..47798675d1 100644
--- a/src/Mod/Draft/Draft.py
+++ b/src/Mod/Draft/Draft.py
@@ -179,6 +179,8 @@ from draftutils.gui_utils import load_texture
 # Draft functions
 #---------------------------------------------------------------------------
 
+from draftfunctions.draftify import draftify
+
 from draftfunctions.fuse import fuse
 
 from draftfunctions.heal import heal
@@ -654,43 +656,6 @@ def rotateEdge(object, edge_index, angle, center, axis):
         rotateVertex(object, edge_index+1, angle, center, axis)
 
 
-def draftify(objectslist,makeblock=False,delete=True):
-    """draftify(objectslist,[makeblock],[delete]): turns each object of the given list
-    (objectslist can also be a single object) into a Draft parametric
-    wire. If makeblock is True, multiple objects will be grouped in a block.
-    If delete = False, old objects are not deleted"""
-    import DraftGeomUtils, Part
-
-    if not isinstance(objectslist,list):
-        objectslist = [objectslist]
-    newobjlist = []
-    for obj in objectslist:
-        if hasattr(obj,'Shape'):
-            for cluster in Part.getSortedClusters(obj.Shape.Edges):
-                w = Part.Wire(cluster)
-                if DraftGeomUtils.hasCurves(w):
-                    if (len(w.Edges) == 1) and (DraftGeomUtils.geomType(w.Edges[0]) == "Circle"):
-                        nobj = makeCircle(w.Edges[0])
-                    else:
-                        nobj = FreeCAD.ActiveDocument.addObject("Part::Feature",obj.Name)
-                        nobj.Shape = w
-                else:
-                    nobj = makeWire(w)
-                newobjlist.append(nobj)
-                formatObject(nobj,obj)
-                # sketches are always in wireframe mode. In Draft we don't like that!
-                if FreeCAD.GuiUp:
-                    nobj.ViewObject.DisplayMode = "Flat Lines"
-            if delete:
-                FreeCAD.ActiveDocument.removeObject(obj.Name)
-
-    if makeblock:
-        return makeBlock(newobjlist)
-    else:
-        if len(newobjlist) == 1:
-            return newobjlist[0]
-        return newobjlist
-
 def getDXF(obj,direction=None):
     """getDXF(object,[direction]): returns a DXF entity from the given
     object. If direction is given, the object is projected in 2D."""
diff --git a/src/Mod/Draft/draftfunctions/draftify.py b/src/Mod/Draft/draftfunctions/draftify.py
new file mode 100644
index 0000000000..d2c2556a6b
--- /dev/null
+++ b/src/Mod/Draft/draftfunctions/draftify.py
@@ -0,0 +1,88 @@
+# ***************************************************************************
+# *   Copyright (c) 2009, 2010 Yorik van Havre <yorik@uncreated.net>        *
+# *   Copyright (c) 2009, 2010 Ken Cline <cline@frii.com>                   *
+# *   Copyright (c) 2020 FreeCAD Developers                                 *
+# *                                                                         *
+# *   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                                                                   *
+# *                                                                         *
+# ***************************************************************************
+"""This module provides the code for Draft draftify function.
+"""
+## @package draftify
+# \ingroup DRAFT
+# \brief This module provides the code for Draft draftify function.
+
+import FreeCAD as App
+
+import draftutils.gui_utils as gui_utils
+import draftutils.utils as utils
+
+from draftmake.make_block import makeBlock
+from draftmake.make_wire import makeWire
+from draftmake.make_circle import makeCircle
+
+
+def draftify(objectslist, makeblock=False, delete=True):
+    """draftify(objectslist,[makeblock],[delete])
+    
+    Turn each object of the given list (objectslist can also be a single 
+    object) into a Draft parametric wire. 
+    
+    TODO: support more objects
+
+    Parameters
+    ----------
+    objectslist :
+
+    makeblock : bool
+        If makeblock is True, multiple objects will be grouped in a block.
+    
+    delete : bool
+        If delete = False, old objects are not deleted
+    """
+    import Part
+    import DraftGeomUtils
+
+    if not isinstance(objectslist,list):
+        objectslist = [objectslist]
+    newobjlist = []
+    for obj in objectslist:
+        if hasattr(obj,'Shape'):
+            for cluster in Part.getSortedClusters(obj.Shape.Edges):
+                w = Part.Wire(cluster)
+                if DraftGeomUtils.hasCurves(w):
+                    if (len(w.Edges) == 1) and (DraftGeomUtils.geomType(w.Edges[0]) == "Circle"):
+                        nobj = makeCircle(w.Edges[0])
+                    else:
+                        nobj = App.ActiveDocument.addObject("Part::Feature", obj.Name)
+                        nobj.Shape = w
+                else:
+                    nobj = makeWire(w)
+                newobjlist.append(nobj)
+                gui_utils.format_object(nobj, obj)
+                # sketches are always in wireframe mode. In Draft we don't like that!
+                if App.GuiUp:
+                    nobj.ViewObject.DisplayMode = "Flat Lines"
+            if delete:
+                App.ActiveDocument.removeObject(obj.Name)
+
+    if makeblock:
+        return makeBlock(newobjlist)
+    else:
+        if len(newobjlist) == 1:
+            return newobjlist[0]
+        return newobjlist