diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
index f68985438e..03d28da2c8 100644
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@@ -466,7 +466,6 @@ SET(Dialog_CPP_SRCS
     DownloadManager.cpp
     DocumentRecovery.cpp
     TaskElementColors.cpp
-    TaskMeasure.cpp
     DlgObjectSelection.cpp
     DlgAddProperty.cpp
     DlgAddPropertyVarSet.cpp
@@ -507,7 +506,6 @@ SET(Dialog_HPP_SRCS
     DownloadManager.h
     DocumentRecovery.h
     TaskElementColors.h
-    TaskMeasure.h
     DlgObjectSelection.h
     DlgAddProperty.h
     DlgAddPropertyVarSet.h
diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp
index 2d95176b3a..0f98d69776 100644
--- a/src/Gui/CommandView.cpp
+++ b/src/Gui/CommandView.cpp
@@ -75,7 +75,6 @@
 #include "SelectionObject.h"
 #include "SoAxisCrossKit.h"
 #include "SoFCOffscreenRenderer.h"
-#include "TaskMeasure.h"
 #include "TextureMapping.h"
 #include "Tools.h"
 #include "Tree.h"
@@ -3137,37 +3136,6 @@ void StdCmdTreeSelectAllInstances::activated(int iMsg)
     Selection().selStackPush();
 }
 
-//===========================================================================
-// Std_Measure
-// this is the Unified Measurement Facility Measure command
-//===========================================================================
-
-
-DEF_STD_CMD_A(StdCmdMeasure)
-
-StdCmdMeasure::StdCmdMeasure()
-  :Command("Std_Measure")
-{
-    sGroup        = "Measure";
-    sMenuText     = QT_TR_NOOP("&Measure");
-    sToolTipText  = QT_TR_NOOP("Measure a feature");
-    sWhatsThis    = "Std_Measure";
-    sStatusTip    = QT_TR_NOOP("Measure a feature");
-    sPixmap       = "umf-measurement";
-}
-
-void StdCmdMeasure::activated(int iMsg)
-{
-    Q_UNUSED(iMsg);
-
-    TaskMeasure *task = new TaskMeasure();
-    Gui::Control().showDialog(task);
-}
-
-
-bool StdCmdMeasure::isActive(){
-    return true;
-}
 
 //===========================================================================
 // Std_SceneInspector
@@ -4066,7 +4034,6 @@ void CreateViewStdCommands()
     rcCmdMgr.addCommand(new StdCmdTreeExpand());
     rcCmdMgr.addCommand(new StdCmdTreeCollapse());
     rcCmdMgr.addCommand(new StdCmdTreeSelectAllInstances());
-    rcCmdMgr.addCommand(new StdCmdMeasure());
     rcCmdMgr.addCommand(new StdCmdSceneInspector());
     rcCmdMgr.addCommand(new StdCmdTextureMapping());
     rcCmdMgr.addCommand(new StdCmdDemoMode());
diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp
index e4ca175b20..0267854d8f 100644
--- a/src/Gui/Workbench.cpp
+++ b/src/Gui/Workbench.cpp
@@ -719,8 +719,6 @@ MenuItem* StdWorkbench::setupMenuBar() const
           << "Std_ExportDependencyGraph"
           << "Std_ProjectUtil"
           << "Separator"
-          << "Std_Measure"
-          << "Separator"
           << "Std_TextDocument"
           << "Separator"
           << "Std_DemoMode"
@@ -803,8 +801,7 @@ ToolBarItem* StdWorkbench::setupToolBars() const
     auto view = new ToolBarItem( root );
     view->setCommand("View");
     *view << "Std_ViewFitAll" << "Std_ViewFitSelection" << "Std_ViewGroup" << "Std_AlignToSelection"
-          << "Separator" << "Std_DrawStyle" << "Std_TreeViewActions"
-          << "Separator" << "Std_Measure";
+          << "Separator" << "Std_DrawStyle" << "Std_TreeViewActions";
 
     // Individual views
     auto individualViews = new ToolBarItem(root, ToolBarItem::DefaultVisibility::Hidden);
diff --git a/src/Mod/Measure/Gui/CMakeLists.txt b/src/Mod/Measure/Gui/CMakeLists.txt
index 4ea36cdc7c..9921d458ea 100644
--- a/src/Mod/Measure/Gui/CMakeLists.txt
+++ b/src/Mod/Measure/Gui/CMakeLists.txt
@@ -51,6 +51,8 @@ SET(MeasureGui_SRCS
     QuickMeasurePyImp.cpp
     QuickMeasure.cpp
     QuickMeasure.h
+    TaskMeasure.cpp
+    TaskMeasure.h
     ViewProviderMeasureBase.cpp
     ViewProviderMeasureBase.h
     ViewProviderMeasureAngle.cpp
diff --git a/src/Mod/Measure/Gui/Command.cpp b/src/Mod/Measure/Gui/Command.cpp
index 1dfe2a942d..b5ef15e6fe 100644
--- a/src/Mod/Measure/Gui/Command.cpp
+++ b/src/Mod/Measure/Gui/Command.cpp
@@ -23,10 +23,52 @@
 
 #include <Gui/Application.h>
 #include <Gui/Command.h>
+#include <Gui/Control.h>
+
+#include "TaskMeasure.h"
+
+
+//===========================================================================
+// Std_Measure
+// this is the Unified Measurement Facility Measure command
+//===========================================================================
+
+
+DEF_STD_CMD_A(StdCmdMeasure)
+
+StdCmdMeasure::StdCmdMeasure()
+    : Command("Std_Measure")
+{
+    sGroup = "Measure";
+    sMenuText = QT_TR_NOOP("&Measure");
+    sToolTipText = QT_TR_NOOP("Measure a feature");
+    sWhatsThis = "Std_Measure";
+    sStatusTip = QT_TR_NOOP("Measure a feature");
+    sPixmap = "umf-measurement";
+}
+
+void StdCmdMeasure::activated(int iMsg)
+{
+    Q_UNUSED(iMsg);
+
+    Gui::TaskMeasure* task = new Gui::TaskMeasure();
+    Gui::Control().showDialog(task);
+}
+
+
+bool StdCmdMeasure::isActive()
+{
+    return true;
+}
+
 
 
-using namespace std;
 
 void CreateMeasureCommands() {
-    Base::Console().Log("Init MeasureGui\n");
+    Gui::CommandManager& rcCmdMgr = Gui::Application::Instance->commandManager();
+
+    auto cmd = new StdCmdMeasure();
+    cmd->initAction();
+    rcCmdMgr.addCommand(cmd);
+
 }
diff --git a/src/Gui/TaskMeasure.cpp b/src/Mod/Measure/Gui/TaskMeasure.cpp
similarity index 98%
rename from src/Gui/TaskMeasure.cpp
rename to src/Mod/Measure/Gui/TaskMeasure.cpp
index e7d460df4f..0e5b6de53a 100644
--- a/src/Gui/TaskMeasure.cpp
+++ b/src/Mod/Measure/Gui/TaskMeasure.cpp
@@ -30,12 +30,12 @@
 
 #include "TaskMeasure.h"
 
-#include "Control.h"
-#include "MainWindow.h"
-#include "Application.h"
-#include "App/Document.h"
-#include "App/DocumentObjectGroup.h"
+#include <App/Document.h>
+#include <App/DocumentObjectGroup.h>
+#include <Gui/MainWindow.h>
+#include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
+#include <Gui/Control.h>
 
 #include <QFormLayout>
 #include <QPushButton>
diff --git a/src/Gui/TaskMeasure.h b/src/Mod/Measure/Gui/TaskMeasure.h
similarity index 96%
rename from src/Gui/TaskMeasure.h
rename to src/Mod/Measure/Gui/TaskMeasure.h
index e4d394fb6c..01010d5f7b 100644
--- a/src/Gui/TaskMeasure.h
+++ b/src/Mod/Measure/Gui/TaskMeasure.h
@@ -30,9 +30,10 @@
 
 #include <Mod/Measure/App/MeasureBase.h>
 
-#include "TaskView/TaskDialog.h"
-#include "TaskView/TaskView.h"
-#include "Selection.h"
+
+#include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
+#include <Gui/Selection.h>
 
 namespace Gui {