diff --git a/src/Mod/Draft/CMakeLists.txt b/src/Mod/Draft/CMakeLists.txt
index fa8f6673c2..37658b24c4 100644
--- a/src/Mod/Draft/CMakeLists.txt
+++ b/src/Mod/Draft/CMakeLists.txt
@@ -13,7 +13,6 @@ SET(Draft_SRCS_base
     DraftVecUtils.py
     DraftGeomUtils.py
     DraftLayer.py
-    DraftEdit.py
     DraftFillet.py
     WorkingPlane.py
     getSVG.py
@@ -85,6 +84,7 @@ SET(Draft_GUI_tools
     draftguitools/gui_snaps.py
     draftguitools/gui_snapper.py
     draftguitools/gui_trackers.py
+    draftguitools/gui_edit.py
     draftguitools/README.md
 )
 
diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index 912e11f803..ab7f5428bb 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -36,7 +36,7 @@ __url__ = "https://www.freecadweb.org"
 # Generic stuff
 #---------------------------------------------------------------------------
 
-import sys, os, FreeCAD, FreeCADGui, WorkingPlane, math, re, Draft, Draft_rc, DraftVecUtils
+import sys, FreeCAD, FreeCADGui, WorkingPlane, math, Draft, Draft_rc, DraftVecUtils
 from FreeCAD import Vector
 from PySide import QtCore,QtGui
 import DraftGui
@@ -56,9 +56,9 @@ if not hasattr(FreeCAD, "DraftWorkingPlane"):
 # Commands that have been migrated to their own modules
 #---------------------------------------------------------------------------
 
-import DraftEdit
-# import DraftFillet
+import draftguitools.gui_edit
 import draftguitools.gui_selectplane
+# import DraftFillet
 import drafttaskpanels.task_shapestring as task_shapestring
 import drafttaskpanels.task_scale as task_scale
 
diff --git a/src/Mod/Draft/DraftEdit.py b/src/Mod/Draft/draftguitools/gui_edit.py
similarity index 99%
rename from src/Mod/Draft/DraftEdit.py
rename to src/Mod/Draft/draftguitools/gui_edit.py
index 095115269c..09d5687e50 100644
--- a/src/Mod/Draft/DraftEdit.py
+++ b/src/Mod/Draft/draftguitools/gui_edit.py
@@ -1,4 +1,8 @@
-# -*- coding: utf8 -*-
+"""Provide the Draft_Edit command used by the Draft workbench."""
+## @package gui_edit
+# \ingroup DRAFT
+# \brief Provide the Draft_Edit command used by the Draft workbench
+
 #***************************************************************************
 #*   Copyright (c) 2009, 2010 Yorik van Havre <yorik@uncreated.net>        *
 #*   Copyright (c) 2009, 2010 Ken Cline <cline@frii.com>                   *