diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp
index ecf1c143fee1..f340f7fbb638 100644
--- a/src/Gui/Action.cpp
+++ b/src/Gui/Action.cpp
@@ -46,7 +46,7 @@
 #include "Action.h"
 #include "BitmapFactory.h"
 #include "Command.h"
-#include "DlgUndoRedo.h"
+#include "Dialogs/DlgUndoRedo.h"
 #include "PreferencePages/DlgSettingsWorkbenchesImp.h"
 #include "Document.h"
 #include "EditorView.h"
diff --git a/src/Gui/ApplicationPy.cpp b/src/Gui/ApplicationPy.cpp
index 1db7e93df416..fbe522eef1e4 100644
--- a/src/Gui/ApplicationPy.cpp
+++ b/src/Gui/ApplicationPy.cpp
@@ -48,7 +48,7 @@
 #include "ApplicationPy.h"
 #include "BitmapFactory.h"
 #include "Command.h"
-#include "DlgPreferencesImp.h"
+#include "Dialogs/DlgPreferencesImp.h"
 #include "Document.h"
 #include "DocumentObserverPython.h"
 #include "DownloadManager.h"
diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
index 45053fa6b44a..c87c17e8c61f 100644
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@@ -48,6 +48,7 @@ include_directories(
     ${CMAKE_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/Quarter
+    ${CMAKE_CURRENT_SOURCE_DIR}/PreferencePages
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${CMAKE_CURRENT_BINARY_DIR}/..
@@ -354,37 +355,37 @@ set_property(SOURCE GraphvizView.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURR
 set_property(SOURCE GraphvizView.h APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_GraphvizView.cpp)
 
 SET(Gui_UIC_SRCS
-    AboutApplication.ui
+    Dialogs/AboutApplication.ui
     Clipping.ui
     DemoMode.ui
-    DlgActions.ui
-    DlgActivateWindow.ui
-    DlgUnitsCalculator.ui
-    DlgAuthorization.ui
-    DlgChooseIcon.ui
-    DlgCreateNewPreferencePack.ui
-    DlgInputDialog.ui
-    DlgKeyboard.ui
-    DlgMacroExecute.ui
-    DlgRunExternal.ui
-    DlgMacroRecord.ui
-    DlgMaterialProperties.ui
-    DlgOnlineHelp.ui
-    DlgParameter.ui
-    DlgParameterFind.ui
-    DlgPreferencePackManagement.ui
-    DlgPreferences.ui
-    DlgProjectInformation.ui
-    DlgProjectUtility.ui
-    DlgPropertyLink.ui
-    DlgRevertToBackupConfig.ui
+    Dialogs/DlgActions.ui
+    Dialogs/DlgActivateWindow.ui
+    Dialogs/DlgUnitsCalculator.ui
+    Dialogs/DlgAuthorization.ui
+    Dialogs/DlgChooseIcon.ui
+    Dialogs/DlgCreateNewPreferencePack.ui
+    Dialogs/DlgInputDialog.ui
+    Dialogs/DlgKeyboard.ui
+    Dialogs/DlgMacroExecute.ui
+    Dialogs/DlgRunExternal.ui
+    Dialogs/DlgMacroRecord.ui
+    Dialogs/DlgMaterialProperties.ui
+    Dialogs/DlgOnlineHelp.ui
+    Dialogs/DlgParameter.ui
+    Dialogs/DlgParameterFind.ui
+    Dialogs/DlgPreferencePackManagement.ui
+    Dialogs/DlgPreferences.ui
+    Dialogs/DlgProjectInformation.ui
+    Dialogs/DlgProjectUtility.ui
+    Dialogs/DlgPropertyLink.ui
+    Dialogs/DlgRevertToBackupConfig.ui
     PreferencePages/DlgSettings3DView.ui
     PreferencePages/DlgSettingsCacheDirectory.ui
-    DlgSettingsColorGradient.ui
+    Dialogs/DlgSettingsColorGradient.ui
     PreferencePages/DlgSettingsDocument.ui
     PreferencePages/DlgSettingsEditor.ui
     PreferencePages/DlgSettingsGeneral.ui
-    DlgSettingsImage.ui
+    Dialogs/DlgSettingsImage.ui
     PreferencePages/DlgSettingsLightSources.ui
     PreferencePages/DlgSettingsMacro.ui
     PreferencePages/DlgSettingsNavigation.ui
@@ -395,15 +396,15 @@ SET(Gui_UIC_SRCS
     PreferencePages/DlgSettingsUI.ui
     PreferencePages/DlgSettingsViewColor.ui
     PreferencePages/DlgSettingsWorkbenches.ui
-    DlgCheckableMessageBox.ui
-    DlgToolbars.ui
-    DlgTreeWidget.ui
-    DlgLocationAngle.ui
-    DlgLocationPos.ui
+    Dialogs/DlgCheckableMessageBox.ui
+    Dialogs/DlgToolbars.ui
+    Dialogs/DlgTreeWidget.ui
+    Dialogs/DlgLocationAngle.ui
+    Dialogs/DlgLocationPos.ui
     DocumentRecovery.ui
     DownloadManager.ui
     DownloadItem.ui
-    DlgExpressionInput.ui
+    Dialogs/DlgExpressionInput.ui
     MouseButtons.ui
     SceneInspector.ui
     InputVector.ui
@@ -415,14 +416,14 @@ SET(Gui_UIC_SRCS
     TaskView/TaskImage.ui
     TaskView/TaskSelectLinkProperty.ui
     TaskElementColors.ui
-    DlgObjectSelection.ui
-    DlgAddProperty.ui
-    DlgAddPropertyVarSet.ui
+    Dialogs/DlgObjectSelection.ui
+    Dialogs/DlgAddProperty.ui
+    Dialogs/DlgAddPropertyVarSet.ui
     VectorListEditor.ui
 )
 
 if(FREECAD_USE_3DCONNEXION_LEGACY)
-    list(APPEND Gui_UIC_SRCS DlgCustomizeSpNavSettings.ui)
+    list(APPEND Gui_UIC_SRCS Dialogs/DlgCustomizeSpNavSettings.ui)
 endif(FREECAD_USE_3DCONNEXION_LEGACY)
 
 set (FreeCAD_TR_QRC ${CMAKE_CURRENT_BINARY_DIR}/Language/FreeCAD_translation.qrc)
@@ -475,28 +476,28 @@ SOURCE_GROUP("Command" FILES ${Command_SRCS})
 SET(Dialog_CPP_SRCS
     Clipping.cpp
     DemoMode.cpp
-    DlgAbout.cpp
-    DlgActivateWindowImp.cpp
-    DlgCreateNewPreferencePackImp.cpp
-    DlgUnitsCalculatorImp.cpp
-    DlgInputDialogImp.cpp
-    DlgMacroExecuteImp.cpp
-    DlgRunExternal.cpp
-    DlgEditFileIncludePropertyExternal.cpp
-    DlgMacroRecordImp.cpp
-    DlgMaterialPropertiesImp.cpp
-    DlgParameterImp.cpp
-    DlgParameterFind.cpp
-    DlgPreferencePackManagementImp.cpp
-    DlgProjectInformationImp.cpp
-    DlgProjectUtility.cpp
-    DlgPropertyLink.cpp
-    DlgRevertToBackupConfigImp.cpp
-    DlgExpressionInput.cpp
+    Dialogs/DlgAbout.cpp
+    Dialogs/DlgActivateWindowImp.cpp
+    Dialogs/DlgCreateNewPreferencePackImp.cpp
+    Dialogs/DlgUnitsCalculatorImp.cpp
+    Dialogs/DlgInputDialogImp.cpp
+    Dialogs/DlgMacroExecuteImp.cpp
+    Dialogs/DlgRunExternal.cpp
+    Dialogs/DlgEditFileIncludePropertyExternal.cpp
+    Dialogs/DlgMacroRecordImp.cpp
+    Dialogs/DlgMaterialPropertiesImp.cpp
+    Dialogs/DlgParameterImp.cpp
+    Dialogs/DlgParameterFind.cpp
+    Dialogs/DlgPreferencePackManagementImp.cpp
+    Dialogs/DlgProjectInformationImp.cpp
+    Dialogs/DlgProjectUtility.cpp
+    Dialogs/DlgPropertyLink.cpp
+    Dialogs/DlgRevertToBackupConfigImp.cpp
+    Dialogs/DlgExpressionInput.cpp
     TaskDlgRelocation.cpp
-    DlgCheckableMessageBox.cpp
+    Dialogs/DlgCheckableMessageBox.cpp
     TaskCSysDragger.cpp
-    DlgUndoRedo.cpp
+    Dialogs/DlgUndoRedo.cpp
     InputVector.cpp
     Placement.cpp
     PropertyPage.cpp
@@ -507,37 +508,37 @@ SET(Dialog_CPP_SRCS
     DownloadManager.cpp
     DocumentRecovery.cpp
     TaskElementColors.cpp
-    DlgObjectSelection.cpp
-    DlgAddProperty.cpp
-    DlgAddPropertyVarSet.cpp
+    Dialogs/DlgObjectSelection.cpp
+    Dialogs/DlgAddProperty.cpp
+    Dialogs/DlgAddPropertyVarSet.cpp
     VectorListEditor.cpp
 )
 
 SET(Dialog_HPP_SRCS
     Clipping.h
     DemoMode.h
-    DlgAbout.h
-    DlgActivateWindowImp.h
-    DlgCreateNewPreferencePackImp.h
-    DlgUnitsCalculatorImp.h
-    DlgInputDialogImp.h
-    DlgMacroExecuteImp.h
-    DlgRunExternal.h
-    DlgEditFileIncludePropertyExternal.h
-    DlgMacroRecordImp.h
-    DlgMaterialPropertiesImp.h
-    DlgParameterImp.h
-    DlgParameterFind.h
-    DlgPreferencePackManagementImp.h
-    DlgProjectInformationImp.h
-    DlgProjectUtility.h
-    DlgPropertyLink.h
-    DlgRevertToBackupConfigImp.h
-    DlgCheckableMessageBox.h
-    DlgExpressionInput.h
+    Dialogs/DlgAbout.h
+    Dialogs/DlgActivateWindowImp.h
+    Dialogs/DlgCreateNewPreferencePackImp.h
+    Dialogs/DlgUnitsCalculatorImp.h
+    Dialogs/DlgInputDialogImp.h
+    Dialogs/DlgMacroExecuteImp.h
+    Dialogs/DlgRunExternal.h
+    Dialogs/DlgEditFileIncludePropertyExternal.h
+    Dialogs/DlgMacroRecordImp.h
+    Dialogs/DlgMaterialPropertiesImp.h
+    Dialogs/DlgParameterImp.h
+    Dialogs/DlgParameterFind.h
+    Dialogs/DlgPreferencePackManagementImp.h
+    Dialogs/DlgProjectInformationImp.h
+    Dialogs/DlgProjectUtility.h
+    Dialogs/DlgPropertyLink.h
+    Dialogs/DlgRevertToBackupConfigImp.h
+    Dialogs/DlgCheckableMessageBox.h
+    Dialogs/DlgExpressionInput.h
     TaskDlgRelocation.h
     TaskCSysDragger.h
-    DlgUndoRedo.h
+    Dialogs/DlgUndoRedo.h
     InputVector.h
     Placement.h
     PropertyPage.h
@@ -548,40 +549,40 @@ SET(Dialog_HPP_SRCS
     DownloadManager.h
     DocumentRecovery.h
     TaskElementColors.h
-    DlgObjectSelection.h
-    DlgAddProperty.h
-    DlgAddPropertyVarSet.h
+    Dialogs/DlgObjectSelection.h
+    Dialogs/DlgAddProperty.h
+    Dialogs/DlgAddPropertyVarSet.h
     VectorListEditor.h
 )
 
 SET(Dialog_SRCS
     ${Dialog_CPP_SRCS}
     ${Dialog_HPP_SRCS}
-    AboutApplication.ui
+    Dialogs/AboutApplication.ui
     Clipping.ui
     DemoMode.ui
-    DlgActivateWindow.ui
-    DlgUnitsCalculator.ui
-    DlgAuthorization.ui
-    DlgInputDialog.ui
-    DlgAddProperty.ui
-    DlgLocationAngle.ui
-    DlgLocationPos.ui
-    DlgMacroExecute.ui
-    DlgRunExternal.ui
-    DlgMacroRecord.ui
-    DlgMaterialProperties.ui
-    DlgParameter.ui
-    DlgParameterFind.ui
-    DlgPreferencePackManagement.ui
-    DlgProjectInformation.ui
-    DlgProjectUtility.ui
-    DlgPropertyLink.ui
-    DlgRevertToBackupConfig.ui
-    DlgCheckableMessageBox.ui
-    DlgTreeWidget.ui
-    DlgExpressionInput.ui
-    DlgCreateNewPreferencePack.ui
+    Dialogs/DlgActivateWindow.ui
+    Dialogs/DlgUnitsCalculator.ui
+    Dialogs/DlgAuthorization.ui
+    Dialogs/DlgInputDialog.ui
+    Dialogs/DlgAddProperty.ui
+    Dialogs/DlgLocationAngle.ui
+    Dialogs/DlgLocationPos.ui
+    Dialogs/DlgMacroExecute.ui
+    Dialogs/DlgRunExternal.ui
+    Dialogs/DlgMacroRecord.ui
+    Dialogs/DlgMaterialProperties.ui
+    Dialogs/DlgParameter.ui
+    Dialogs/DlgParameterFind.ui
+    Dialogs/DlgPreferencePackManagement.ui
+    Dialogs/DlgProjectInformation.ui
+    Dialogs/DlgProjectUtility.ui
+    Dialogs/DlgPropertyLink.ui
+    Dialogs/DlgRevertToBackupConfig.ui
+    Dialogs/DlgCheckableMessageBox.ui
+    Dialogs/DlgTreeWidget.ui
+    Dialogs/DlgExpressionInput.ui
+    Dialogs/DlgCreateNewPreferencePack.ui
     DownloadManager.ui
     DownloadItem.ui
     DocumentRecovery.ui
@@ -591,58 +592,58 @@ SET(Dialog_SRCS
     SceneInspector.ui
     TextureMapping.ui
     TaskElementColors.ui
-    DlgObjectSelection.ui
+    Dialogs/DlgObjectSelection.ui
     VectorListEditor.ui
 )
 SOURCE_GROUP("Dialog" FILES ${Dialog_SRCS})
 
 # The customize dialog sources
 SET(Dialog_Customize_CPP_SRCS
-    DlgActionsImp.cpp
-    DlgCustomizeImp.cpp
-    DlgKeyboardImp.cpp
-    DlgToolbarsImp.cpp
-    ListWidgetDragBugFix.cpp
+    Dialogs/DlgActionsImp.cpp
+    Dialogs/DlgCustomizeImp.cpp
+    Dialogs/DlgKeyboardImp.cpp
+    Dialogs/DlgToolbarsImp.cpp
+    PreferencePages/ListWidgetDragBugFix.cpp
 )
 SET(Dialog_Customize_HPP_SRCS
-    DlgActionsImp.h
-    DlgCustomizeImp.h
-    DlgKeyboardImp.h
-    DlgToolbarsImp.h
-    ListWidgetDragBugFix.h
+    Dialogs/DlgActionsImp.h
+    Dialogs/DlgCustomizeImp.h
+    Dialogs/DlgKeyboardImp.h
+    Dialogs/DlgToolbarsImp.h
+    PreferencePages/ListWidgetDragBugFix.h
 )
 
 if(FREECAD_USE_3DCONNEXION_LEGACY)
-    list(APPEND Dialog_Customize_CPP_SRCS DlgCustomizeSpaceball.cpp DlgCustomizeSpNavSettings.cpp)
-    list(APPEND Dialog_Customize_HPP_SRCS DlgCustomizeSpaceball.h DlgCustomizeSpNavSettings.h)
+    list(APPEND Dialog_Customize_CPP_SRCS Dialogs/DlgCustomizeSpaceball.cpp Dialogs/DlgCustomizeSpNavSettings.cpp)
+    list(APPEND Dialog_Customize_HPP_SRCS Dialogs/DlgCustomizeSpaceball.h Dialogs/DlgCustomizeSpNavSettings.h)
 endif(FREECAD_USE_3DCONNEXION_LEGACY)
 
 SET(Dialog_Customize_SRCS
     ${Dialog_Customize_CPP_SRCS}
     ${Dialog_Customize_HPP_SRCS}
-    DlgActions.ui
-    DlgChooseIcon.ui
-    DlgKeyboard.ui
-    DlgToolbars.ui
+    Dialogs/DlgActions.ui
+    Dialogs/DlgChooseIcon.ui
+    Dialogs/DlgKeyboard.ui
+    Dialogs/DlgToolbars.ui
 )
 
 if(FREECAD_USE_3DCONNEXION_LEGACY)
-    list(APPEND Dialog_Customize_SRCS  DlgCustomizeSpNavSettings.ui)
+    list(APPEND Dialog_Customize_SRCS  Dialogs/DlgCustomizeSpNavSettings.ui)
 endif(FREECAD_USE_3DCONNEXION_LEGACY)
 
 SOURCE_GROUP("Dialog\\Customize" FILES ${Dialog_Customize_SRCS})
 
 # The settings dialog sources
 SET(Dialog_Settings_CPP_SRCS
-    DlgOnlineHelpImp.cpp
-    DlgPreferencesImp.cpp
+    Dialogs/DlgOnlineHelpImp.cpp
+    Dialogs/DlgPreferencesImp.cpp
     PreferencePages/DlgSettings3DViewImp.cpp
     PreferencePages/DlgSettingsCacheDirectory.cpp
-    DlgSettingsColorGradientImp.cpp
+    Dialogs/DlgSettingsColorGradientImp.cpp
     PreferencePages/DlgSettingsDocumentImp.cpp
     PreferencePages/DlgSettingsEditor.cpp
     PreferencePages/DlgSettingsGeneral.cpp
-    DlgSettingsImageImp.cpp
+    Dialogs/DlgSettingsImageImp.cpp
     PreferencePages/DlgSettingsLightSources.cpp
     PreferencePages/DlgSettingsMacroImp.cpp
     PreferencePages/DlgSettingsNavigation.cpp
@@ -656,15 +657,15 @@ SET(Dialog_Settings_CPP_SRCS
     PreferencePages/DlgSettingsAdvanced.cpp
 )
 SET(Dialog_Settings_HPP_SRCS
-    DlgOnlineHelpImp.h
-    DlgPreferencesImp.h
+    Dialogs/DlgOnlineHelpImp.h
+    Dialogs/DlgPreferencesImp.h
     PreferencePages/DlgSettings3DViewImp.h
     PreferencePages/DlgSettingsCacheDirectory.h
-    DlgSettingsColorGradientImp.h
+    Dialogs/DlgSettingsColorGradientImp.h
     PreferencePages/DlgSettingsDocumentImp.h
     PreferencePages/DlgSettingsEditor.h
     PreferencePages/DlgSettingsGeneral.h
-    DlgSettingsImageImp.h
+    Dialogs/DlgSettingsImageImp.h
     PreferencePages/DlgSettingsLightSources.h
     PreferencePages/DlgSettingsMacroImp.h
     PreferencePages/DlgSettingsNavigation.h
@@ -680,15 +681,15 @@ SET(Dialog_Settings_HPP_SRCS
 SET(Dialog_Settings_SRCS
     ${Dialog_Settings_CPP_SRCS}
     ${Dialog_Settings_HPP_SRCS}
-    DlgOnlineHelp.ui
-    DlgPreferences.ui
+    Dialogs/DlgOnlineHelp.ui
+    Dialogs/DlgPreferences.ui
     PreferencePages/DlgSettings3DView.ui
     PreferencePages/DlgSettingsCacheDirectory.ui
-    DlgSettingsColorGradient.ui
+    Dialogs/DlgSettingsColorGradient.ui
     PreferencePages/DlgSettingsDocument.ui
     PreferencePages/DlgSettingsEditor.ui
     PreferencePages/DlgSettingsGeneral.ui
-    DlgSettingsImage.ui
+    Dialogs/DlgSettingsImage.ui
     PreferencePages/DlgSettingsLightSources.ui
     PreferencePages/DlgSettingsMacro.ui
     PreferencePages/DlgSettingsNavigation.ui
diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp
index 750cd4fbf0cb..848e71a1e889 100644
--- a/src/Gui/Command.cpp
+++ b/src/Gui/Command.cpp
@@ -50,7 +50,7 @@
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "Control.h"
-#include "DlgUndoRedo.h"
+#include "Dialogs/DlgUndoRedo.h"
 #include "Document.h"
 #include "frameobject.h"
 #include "Macro.h"
diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp
index a61512d16cd3..73d746c5debe 100644
--- a/src/Gui/CommandDoc.cpp
+++ b/src/Gui/CommandDoc.cpp
@@ -55,9 +55,9 @@
 #include "FileDialog.h"
 #include "MainWindow.h"
 #include "Selection.h"
-#include "DlgObjectSelection.h"
-#include "DlgProjectInformationImp.h"
-#include "DlgProjectUtility.h"
+#include "Dialogs/DlgObjectSelection.h"
+#include "Dialogs/DlgProjectInformationImp.h"
+#include "Dialogs/DlgProjectUtility.h"
 #include "GraphvizView.h"
 #include "ManualAlignment.h"
 #include "MergeDocuments.h"
diff --git a/src/Gui/CommandMacro.cpp b/src/Gui/CommandMacro.cpp
index f192213ae85e..ed022cde1a46 100644
--- a/src/Gui/CommandMacro.cpp
+++ b/src/Gui/CommandMacro.cpp
@@ -29,8 +29,8 @@
 #include "Action.h"
 #include "Application.h"
 #include "BitmapFactory.h"
-#include "DlgMacroExecuteImp.h"
-#include "DlgMacroRecordImp.h"
+#include "Dialogs/DlgMacroExecuteImp.h"
+#include "Dialogs/DlgMacroRecordImp.h"
 #include "Macro.h"
 #include "MainWindow.h"
 #include "PythonDebugger.h"
diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp
index 67536d6d6245..fca4486f29b5 100644
--- a/src/Gui/CommandStd.cpp
+++ b/src/Gui/CommandStd.cpp
@@ -42,11 +42,11 @@
 #include "Action.h"
 #include "BitmapFactory.h"
 #include "Command.h"
-#include "DlgAbout.h"
-#include "DlgCustomizeImp.h"
-#include "DlgParameterImp.h"
-#include "DlgPreferencesImp.h"
-#include "DlgUnitsCalculatorImp.h"
+#include "Dialogs/DlgAbout.h"
+#include "Dialogs/DlgCustomizeImp.h"
+#include "Dialogs/DlgParameterImp.h"
+#include "Dialogs/DlgPreferencesImp.h"
+#include "Dialogs/DlgUnitsCalculatorImp.h"
 #include "GuiConsole.h"
 #include "MainWindow.h"
 #include "OnlineDocumentation.h"
diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp
index 672c4862c6c5..4182446f568c 100644
--- a/src/Gui/CommandView.cpp
+++ b/src/Gui/CommandView.cpp
@@ -61,7 +61,7 @@
 #include "Control.h"
 #include "Clipping.h"
 #include "DemoMode.h"
-#include "DlgSettingsImageImp.h"
+#include "Dialogs/DlgSettingsImageImp.h"
 #include "Document.h"
 #include "FileDialog.h"
 #include "ImageView.h"
diff --git a/src/Gui/CommandWindow.cpp b/src/Gui/CommandWindow.cpp
index c8ee5c24ed67..b4e925aee51a 100644
--- a/src/Gui/CommandWindow.cpp
+++ b/src/Gui/CommandWindow.cpp
@@ -34,7 +34,7 @@
 #include "MainWindow.h"
 #include "View.h"
 #include "Document.h"
-#include "DlgActivateWindowImp.h"
+#include "Dialogs/DlgActivateWindowImp.h"
 #include "DockWindowManager.h"
 #include "ToolBarManager.h"
 
diff --git a/src/Gui/AboutApplication.ui b/src/Gui/Dialogs/AboutApplication.ui
similarity index 99%
rename from src/Gui/AboutApplication.ui
rename to src/Gui/Dialogs/AboutApplication.ui
index 61787e56c17f..d8b4daa7fd15 100644
--- a/src/Gui/AboutApplication.ui
+++ b/src/Gui/Dialogs/AboutApplication.ui
@@ -33,7 +33,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/freecadsplash.png</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/freecadsplash.png</pixmap>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -398,7 +398,7 @@ p, li { white-space: pre-wrap; }
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="Icons/resource.qrc"/>
+  <include location="../Icons/resource.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/Gui/DlgAbout.cpp b/src/Gui/Dialogs/DlgAbout.cpp
similarity index 99%
rename from src/Gui/DlgAbout.cpp
rename to src/Gui/Dialogs/DlgAbout.cpp
index 74ec04eaee11..d1d5e5316dd0 100644
--- a/src/Gui/DlgAbout.cpp
+++ b/src/Gui/Dialogs/DlgAbout.cpp
@@ -52,7 +52,7 @@
 #include <zlib.h>
 
 #include "BitmapFactory.h"
-#include "DlgAbout.h"
+#include "Dialogs/DlgAbout.h"
 #include "MainWindow.h"
 #include "SplashScreen.h"
 #include "ui_AboutApplication.h"
diff --git a/src/Gui/DlgAbout.h b/src/Gui/Dialogs/DlgAbout.h
similarity index 100%
rename from src/Gui/DlgAbout.h
rename to src/Gui/Dialogs/DlgAbout.h
diff --git a/src/Gui/DlgActions.ui b/src/Gui/Dialogs/DlgActions.ui
similarity index 100%
rename from src/Gui/DlgActions.ui
rename to src/Gui/Dialogs/DlgActions.ui
diff --git a/src/Gui/DlgActionsImp.cpp b/src/Gui/Dialogs/DlgActionsImp.cpp
similarity index 97%
rename from src/Gui/DlgActionsImp.cpp
rename to src/Gui/Dialogs/DlgActionsImp.cpp
index a1c72702e520..0bd33c804ab9 100644
--- a/src/Gui/DlgActionsImp.cpp
+++ b/src/Gui/Dialogs/DlgActionsImp.cpp
@@ -33,7 +33,7 @@
 #include <QMessageBox>
 #endif
 
-#include "DlgActionsImp.h"
+#include "Dialogs/DlgActionsImp.h"
 #include "ui_DlgActions.h"
 #include "Action.h"
 #include "Application.h"
diff --git a/src/Gui/DlgActionsImp.h b/src/Gui/Dialogs/DlgActionsImp.h
similarity index 100%
rename from src/Gui/DlgActionsImp.h
rename to src/Gui/Dialogs/DlgActionsImp.h
diff --git a/src/Gui/DlgActivateWindow.ui b/src/Gui/Dialogs/DlgActivateWindow.ui
similarity index 100%
rename from src/Gui/DlgActivateWindow.ui
rename to src/Gui/Dialogs/DlgActivateWindow.ui
diff --git a/src/Gui/DlgActivateWindowImp.cpp b/src/Gui/Dialogs/DlgActivateWindowImp.cpp
similarity index 96%
rename from src/Gui/DlgActivateWindowImp.cpp
rename to src/Gui/Dialogs/DlgActivateWindowImp.cpp
index 1a7abd4829dc..8449fe906996 100644
--- a/src/Gui/DlgActivateWindowImp.cpp
+++ b/src/Gui/Dialogs/DlgActivateWindowImp.cpp
@@ -26,7 +26,7 @@
 # include <QPushButton>
 #endif
 
-#include "DlgActivateWindowImp.h"
+#include "Dialogs/DlgActivateWindowImp.h"
 #include "ui_DlgActivateWindow.h"
 #include "MainWindow.h"
 #include "MDIView.h"
diff --git a/src/Gui/DlgActivateWindowImp.h b/src/Gui/Dialogs/DlgActivateWindowImp.h
similarity index 100%
rename from src/Gui/DlgActivateWindowImp.h
rename to src/Gui/Dialogs/DlgActivateWindowImp.h
diff --git a/src/Gui/DlgAddProperty.cpp b/src/Gui/Dialogs/DlgAddProperty.cpp
similarity index 97%
rename from src/Gui/DlgAddProperty.cpp
rename to src/Gui/Dialogs/DlgAddProperty.cpp
index 1454fec98a51..f307dbf8bdb0 100644
--- a/src/Gui/DlgAddProperty.cpp
+++ b/src/Gui/Dialogs/DlgAddProperty.cpp
@@ -31,7 +31,7 @@
 #include <App/ExpressionParser.h>
 #include <Base/Tools.h>
 
-#include "DlgAddProperty.h"
+#include "Dialogs/DlgAddProperty.h"
 #include "ui_DlgAddProperty.h"
 #include "MainWindow.h"
 #include "ViewProviderDocumentObject.h"
diff --git a/src/Gui/DlgAddProperty.h b/src/Gui/Dialogs/DlgAddProperty.h
similarity index 100%
rename from src/Gui/DlgAddProperty.h
rename to src/Gui/Dialogs/DlgAddProperty.h
diff --git a/src/Gui/DlgAddProperty.ui b/src/Gui/Dialogs/DlgAddProperty.ui
similarity index 100%
rename from src/Gui/DlgAddProperty.ui
rename to src/Gui/Dialogs/DlgAddProperty.ui
diff --git a/src/Gui/DlgAddPropertyVarSet.cpp b/src/Gui/Dialogs/DlgAddPropertyVarSet.cpp
similarity index 99%
rename from src/Gui/DlgAddPropertyVarSet.cpp
rename to src/Gui/Dialogs/DlgAddPropertyVarSet.cpp
index adbd4a350460..958852746468 100644
--- a/src/Gui/DlgAddPropertyVarSet.cpp
+++ b/src/Gui/Dialogs/DlgAddPropertyVarSet.cpp
@@ -34,7 +34,7 @@
 #include <App/PropertyUnits.h>
 #include <Base/Tools.h>
 
-#include "DlgAddPropertyVarSet.h"
+#include "Dialogs/DlgAddPropertyVarSet.h"
 #include "ui_DlgAddPropertyVarSet.h"
 #include "MainWindow.h"
 #include "ViewProviderVarSet.h"
diff --git a/src/Gui/DlgAddPropertyVarSet.h b/src/Gui/Dialogs/DlgAddPropertyVarSet.h
similarity index 100%
rename from src/Gui/DlgAddPropertyVarSet.h
rename to src/Gui/Dialogs/DlgAddPropertyVarSet.h
diff --git a/src/Gui/DlgAddPropertyVarSet.ui b/src/Gui/Dialogs/DlgAddPropertyVarSet.ui
similarity index 100%
rename from src/Gui/DlgAddPropertyVarSet.ui
rename to src/Gui/Dialogs/DlgAddPropertyVarSet.ui
diff --git a/src/Gui/DlgAuthorization.ui b/src/Gui/Dialogs/DlgAuthorization.ui
similarity index 100%
rename from src/Gui/DlgAuthorization.ui
rename to src/Gui/Dialogs/DlgAuthorization.ui
diff --git a/src/Gui/DlgCheckableMessageBox.cpp b/src/Gui/Dialogs/DlgCheckableMessageBox.cpp
similarity index 99%
rename from src/Gui/DlgCheckableMessageBox.cpp
rename to src/Gui/Dialogs/DlgCheckableMessageBox.cpp
index 815281ec2bf0..072be58316d6 100644
--- a/src/Gui/DlgCheckableMessageBox.cpp
+++ b/src/Gui/Dialogs/DlgCheckableMessageBox.cpp
@@ -35,7 +35,7 @@
 
 #include <App/Application.h>
 
-#include "DlgCheckableMessageBox.h"
+#include "Dialogs/DlgCheckableMessageBox.h"
 #include "ui_DlgCheckableMessageBox.h"
 #include "MainWindow.h"
 
diff --git a/src/Gui/DlgCheckableMessageBox.h b/src/Gui/Dialogs/DlgCheckableMessageBox.h
similarity index 100%
rename from src/Gui/DlgCheckableMessageBox.h
rename to src/Gui/Dialogs/DlgCheckableMessageBox.h
diff --git a/src/Gui/DlgCheckableMessageBox.ui b/src/Gui/Dialogs/DlgCheckableMessageBox.ui
similarity index 100%
rename from src/Gui/DlgCheckableMessageBox.ui
rename to src/Gui/Dialogs/DlgCheckableMessageBox.ui
diff --git a/src/Gui/DlgChooseIcon.ui b/src/Gui/Dialogs/DlgChooseIcon.ui
similarity index 100%
rename from src/Gui/DlgChooseIcon.ui
rename to src/Gui/Dialogs/DlgChooseIcon.ui
diff --git a/src/Gui/DlgCreateNewPreferencePack.ui b/src/Gui/Dialogs/DlgCreateNewPreferencePack.ui
similarity index 100%
rename from src/Gui/DlgCreateNewPreferencePack.ui
rename to src/Gui/Dialogs/DlgCreateNewPreferencePack.ui
diff --git a/src/Gui/DlgCreateNewPreferencePackImp.cpp b/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.cpp
similarity index 99%
rename from src/Gui/DlgCreateNewPreferencePackImp.cpp
rename to src/Gui/Dialogs/DlgCreateNewPreferencePackImp.cpp
index 5f0656ea38c6..e9b0577ca56a 100644
--- a/src/Gui/DlgCreateNewPreferencePackImp.cpp
+++ b/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.cpp
@@ -29,7 +29,7 @@
 # include <QRegularExpressionMatch>
 #endif
 
-#include "DlgCreateNewPreferencePackImp.h"
+#include "Dialogs/DlgCreateNewPreferencePackImp.h"
 #include "ui_DlgCreateNewPreferencePack.h"
 
 #include "FileDialog.h"
diff --git a/src/Gui/DlgCreateNewPreferencePackImp.h b/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.h
similarity index 100%
rename from src/Gui/DlgCreateNewPreferencePackImp.h
rename to src/Gui/Dialogs/DlgCreateNewPreferencePackImp.h
diff --git a/src/Gui/DlgCustomizeImp.cpp b/src/Gui/Dialogs/DlgCustomizeImp.cpp
similarity index 96%
rename from src/Gui/DlgCustomizeImp.cpp
rename to src/Gui/Dialogs/DlgCustomizeImp.cpp
index c1109d25c5a3..df6614d84bde 100644
--- a/src/Gui/DlgCustomizeImp.cpp
+++ b/src/Gui/Dialogs/DlgCustomizeImp.cpp
@@ -29,7 +29,7 @@
 # include <QSizePolicy>
 #endif
 
-#include "DlgCustomizeImp.h"
+#include "Dialogs/DlgCustomizeImp.h"
 #include "MainWindow.h"
 #include "WidgetFactory.h"
 
diff --git a/src/Gui/DlgCustomizeImp.h b/src/Gui/Dialogs/DlgCustomizeImp.h
similarity index 100%
rename from src/Gui/DlgCustomizeImp.h
rename to src/Gui/Dialogs/DlgCustomizeImp.h
diff --git a/src/Gui/DlgCustomizeSpNavSettings.cpp b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp
similarity index 99%
rename from src/Gui/DlgCustomizeSpNavSettings.cpp
rename to src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp
index 3840d0b20e48..8ee96ead4518 100644
--- a/src/Gui/DlgCustomizeSpNavSettings.cpp
+++ b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp
@@ -22,7 +22,7 @@
 
 #include "PreCompiled.h"
 
-#include "DlgCustomizeSpNavSettings.h"
+#include "Dialogs/DlgCustomizeSpNavSettings.h"
 #include "ui_DlgCustomizeSpNavSettings.h"
 #include "Application.h"
 #include "GuiApplicationNativeEventAware.h"
diff --git a/src/Gui/DlgCustomizeSpNavSettings.h b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.h
similarity index 100%
rename from src/Gui/DlgCustomizeSpNavSettings.h
rename to src/Gui/Dialogs/DlgCustomizeSpNavSettings.h
diff --git a/src/Gui/DlgCustomizeSpNavSettings.ui b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.ui
similarity index 96%
rename from src/Gui/DlgCustomizeSpNavSettings.ui
rename to src/Gui/Dialogs/DlgCustomizeSpNavSettings.ui
index 67844700296a..06665c5de340 100644
--- a/src/Gui/DlgCustomizeSpNavSettings.ui
+++ b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.ui
@@ -140,7 +140,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/SpNav-PanLR</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/SpNav-PanLR</pixmap>
          </property>
         </widget>
        </item>
@@ -150,7 +150,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/SpNav-PanUD</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/SpNav-PanUD</pixmap>
          </property>
         </widget>
        </item>
@@ -160,7 +160,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/SpNav-Zoom</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/SpNav-Zoom</pixmap>
          </property>
         </widget>
        </item>
@@ -170,7 +170,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/SpNav-Tilt</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/SpNav-Tilt</pixmap>
          </property>
         </widget>
        </item>
@@ -180,7 +180,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/SpNav-Roll</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/SpNav-Roll</pixmap>
          </property>
         </widget>
        </item>
@@ -190,7 +190,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/SpNav-Spin</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/SpNav-Spin</pixmap>
          </property>
         </widget>
        </item>
@@ -528,7 +528,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="Icons/resource.qrc"/>
+  <include location="../Icons/resource.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/Gui/DlgCustomizeSpaceball.cpp b/src/Gui/Dialogs/DlgCustomizeSpaceball.cpp
similarity index 99%
rename from src/Gui/DlgCustomizeSpaceball.cpp
rename to src/Gui/Dialogs/DlgCustomizeSpaceball.cpp
index aa4a00cca6ea..8630d7a688f5 100644
--- a/src/Gui/DlgCustomizeSpaceball.cpp
+++ b/src/Gui/Dialogs/DlgCustomizeSpaceball.cpp
@@ -39,7 +39,7 @@
 #include "Base/Console.h"
 
 #include "Command.h"
-#include "DlgCustomizeSpaceball.h"
+#include "Dialogs/DlgCustomizeSpaceball.h"
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "GuiApplicationNativeEventAware.h"
diff --git a/src/Gui/DlgCustomizeSpaceball.h b/src/Gui/Dialogs/DlgCustomizeSpaceball.h
similarity index 100%
rename from src/Gui/DlgCustomizeSpaceball.h
rename to src/Gui/Dialogs/DlgCustomizeSpaceball.h
diff --git a/src/Gui/DlgEditFileIncludePropertyExternal.cpp b/src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.cpp
similarity index 95%
rename from src/Gui/DlgEditFileIncludePropertyExternal.cpp
rename to src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.cpp
index f273a21611b3..803372e5b28c 100644
--- a/src/Gui/DlgEditFileIncludePropertyExternal.cpp
+++ b/src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.cpp
@@ -22,7 +22,7 @@
 
 #include "PreCompiled.h"
 
-#include "DlgEditFileIncludePropertyExternal.h"
+#include "Dialogs/DlgEditFileIncludePropertyExternal.h"
 #include "Application.h"
 #include "FileDialog.h"
 
diff --git a/src/Gui/DlgEditFileIncludePropertyExternal.h b/src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.h
similarity index 96%
rename from src/Gui/DlgEditFileIncludePropertyExternal.h
rename to src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.h
index 9826c4c047ea..d31101ce5b54 100644
--- a/src/Gui/DlgEditFileIncludePropertyExternal.h
+++ b/src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.h
@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DlgEditFileIncludePropertyExternal_H
 #define GUI_DIALOG_DlgEditFileIncludePropertyExternal_H
 
-#include "DlgRunExternal.h"
+#include "Dialogs/DlgRunExternal.h"
 #include <App/PropertyFile.h>
 
 namespace Gui {
diff --git a/src/Gui/DlgExpressionInput.cpp b/src/Gui/Dialogs/DlgExpressionInput.cpp
similarity index 99%
rename from src/Gui/DlgExpressionInput.cpp
rename to src/Gui/Dialogs/DlgExpressionInput.cpp
index 61798c8fa421..98e279af6a1b 100644
--- a/src/Gui/DlgExpressionInput.cpp
+++ b/src/Gui/Dialogs/DlgExpressionInput.cpp
@@ -37,7 +37,7 @@
 #include <App/VarSet.h>
 #include <Base/Tools.h>
 
-#include "DlgExpressionInput.h"
+#include "Dialogs/DlgExpressionInput.h"
 #include "ui_DlgExpressionInput.h"
 #include "Application.h"
 #include "Command.h"
diff --git a/src/Gui/DlgExpressionInput.h b/src/Gui/Dialogs/DlgExpressionInput.h
similarity index 100%
rename from src/Gui/DlgExpressionInput.h
rename to src/Gui/Dialogs/DlgExpressionInput.h
diff --git a/src/Gui/DlgExpressionInput.ui b/src/Gui/Dialogs/DlgExpressionInput.ui
similarity index 100%
rename from src/Gui/DlgExpressionInput.ui
rename to src/Gui/Dialogs/DlgExpressionInput.ui
diff --git a/src/Gui/DlgInputDialog.ui b/src/Gui/Dialogs/DlgInputDialog.ui
similarity index 100%
rename from src/Gui/DlgInputDialog.ui
rename to src/Gui/Dialogs/DlgInputDialog.ui
diff --git a/src/Gui/DlgInputDialogImp.cpp b/src/Gui/Dialogs/DlgInputDialogImp.cpp
similarity index 95%
rename from src/Gui/DlgInputDialogImp.cpp
rename to src/Gui/Dialogs/DlgInputDialogImp.cpp
index 5f70de8a6c13..b386dd0151b1 100644
--- a/src/Gui/DlgInputDialogImp.cpp
+++ b/src/Gui/Dialogs/DlgInputDialogImp.cpp
@@ -26,7 +26,7 @@
 # include <QPushButton>
 #endif
 
-#include "DlgInputDialogImp.h"
+#include "Dialogs/DlgInputDialogImp.h"
 #include "ui_DlgInputDialog.h"
 #include "SpinBox.h"
 
diff --git a/src/Gui/DlgInputDialogImp.h b/src/Gui/Dialogs/DlgInputDialogImp.h
similarity index 100%
rename from src/Gui/DlgInputDialogImp.h
rename to src/Gui/Dialogs/DlgInputDialogImp.h
diff --git a/src/Gui/DlgKeyboard.ui b/src/Gui/Dialogs/DlgKeyboard.ui
similarity index 100%
rename from src/Gui/DlgKeyboard.ui
rename to src/Gui/Dialogs/DlgKeyboard.ui
diff --git a/src/Gui/DlgKeyboardImp.cpp b/src/Gui/Dialogs/DlgKeyboardImp.cpp
similarity index 97%
rename from src/Gui/DlgKeyboardImp.cpp
rename to src/Gui/Dialogs/DlgKeyboardImp.cpp
index fe703f5a4495..6a90b7950c42 100644
--- a/src/Gui/DlgKeyboardImp.cpp
+++ b/src/Gui/Dialogs/DlgKeyboardImp.cpp
@@ -34,7 +34,7 @@
 #include <Base/Tools.h>
 #include <Base/Console.h>
 
-#include "DlgKeyboardImp.h"
+#include "Dialogs/DlgKeyboardImp.h"
 #include "ui_DlgKeyboard.h"
 #include "Action.h"
 #include "Application.h"
diff --git a/src/Gui/DlgKeyboardImp.h b/src/Gui/Dialogs/DlgKeyboardImp.h
similarity index 97%
rename from src/Gui/DlgKeyboardImp.h
rename to src/Gui/Dialogs/DlgKeyboardImp.h
index a52a67282a51..1cdc95443984 100644
--- a/src/Gui/DlgKeyboardImp.h
+++ b/src/Gui/Dialogs/DlgKeyboardImp.h
@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DLGKEYBOARD_IMP_H
 #define GUI_DIALOG_DLGKEYBOARD_IMP_H
 
-#include <boost/signals2/connection.hpp>
+#include <boost/signals2.hpp>
 #include <memory>
 #include <QPointer>
 #include <QAction>
diff --git a/src/Gui/DlgLocationAngle.ui b/src/Gui/Dialogs/DlgLocationAngle.ui
similarity index 100%
rename from src/Gui/DlgLocationAngle.ui
rename to src/Gui/Dialogs/DlgLocationAngle.ui
diff --git a/src/Gui/DlgLocationPos.ui b/src/Gui/Dialogs/DlgLocationPos.ui
similarity index 100%
rename from src/Gui/DlgLocationPos.ui
rename to src/Gui/Dialogs/DlgLocationPos.ui
diff --git a/src/Gui/DlgMacroExecute.ui b/src/Gui/Dialogs/DlgMacroExecute.ui
similarity index 100%
rename from src/Gui/DlgMacroExecute.ui
rename to src/Gui/Dialogs/DlgMacroExecute.ui
diff --git a/src/Gui/DlgMacroExecuteImp.cpp b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp
similarity index 97%
rename from src/Gui/DlgMacroExecuteImp.cpp
rename to src/Gui/Dialogs/DlgMacroExecuteImp.cpp
index 24ac9e982dc6..2b8401b61a1a 100644
--- a/src/Gui/DlgMacroExecuteImp.cpp
+++ b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp
@@ -34,13 +34,13 @@
 #include <App/Document.h>
 #include <Base/Interpreter.h>
 
-#include "DlgMacroExecuteImp.h"
+#include "Dialogs/DlgMacroExecuteImp.h"
 #include "ui_DlgMacroExecute.h"
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "Command.h"
-#include "DlgCustomizeImp.h"
-#include "DlgToolbarsImp.h"
+#include "Dialogs/DlgCustomizeImp.h"
+#include "Dialogs/DlgToolbarsImp.h"
 #include "Document.h"
 #include "EditorView.h"
 #include "Macro.h"
diff --git a/src/Gui/DlgMacroExecuteImp.h b/src/Gui/Dialogs/DlgMacroExecuteImp.h
similarity index 100%
rename from src/Gui/DlgMacroExecuteImp.h
rename to src/Gui/Dialogs/DlgMacroExecuteImp.h
diff --git a/src/Gui/DlgMacroRecord.ui b/src/Gui/Dialogs/DlgMacroRecord.ui
similarity index 100%
rename from src/Gui/DlgMacroRecord.ui
rename to src/Gui/Dialogs/DlgMacroRecord.ui
diff --git a/src/Gui/DlgMacroRecordImp.cpp b/src/Gui/Dialogs/DlgMacroRecordImp.cpp
similarity index 96%
rename from src/Gui/DlgMacroRecordImp.cpp
rename to src/Gui/Dialogs/DlgMacroRecordImp.cpp
index 9e0f6b3d1b7c..01ae153a2b16 100644
--- a/src/Gui/DlgMacroRecordImp.cpp
+++ b/src/Gui/Dialogs/DlgMacroRecordImp.cpp
@@ -28,7 +28,7 @@
 #include <QMessageBox>
 #endif
 
-#include "DlgMacroRecordImp.h"
+#include "Dialogs/DlgMacroRecordImp.h"
 #include "ui_DlgMacroRecord.h"
 #include "Application.h"
 #include "FileDialog.h"
diff --git a/src/Gui/DlgMacroRecordImp.h b/src/Gui/Dialogs/DlgMacroRecordImp.h
similarity index 100%
rename from src/Gui/DlgMacroRecordImp.h
rename to src/Gui/Dialogs/DlgMacroRecordImp.h
diff --git a/src/Gui/DlgMaterialProperties.ui b/src/Gui/Dialogs/DlgMaterialProperties.ui
similarity index 100%
rename from src/Gui/DlgMaterialProperties.ui
rename to src/Gui/Dialogs/DlgMaterialProperties.ui
diff --git a/src/Gui/DlgMaterialPropertiesImp.cpp b/src/Gui/Dialogs/DlgMaterialPropertiesImp.cpp
similarity index 96%
rename from src/Gui/DlgMaterialPropertiesImp.cpp
rename to src/Gui/Dialogs/DlgMaterialPropertiesImp.cpp
index 77defe683671..a121928968f3 100644
--- a/src/Gui/DlgMaterialPropertiesImp.cpp
+++ b/src/Gui/Dialogs/DlgMaterialPropertiesImp.cpp
@@ -24,7 +24,7 @@
 
 #include <App/PropertyStandard.h>
 
-#include "DlgMaterialPropertiesImp.h"
+#include "Dialogs/DlgMaterialPropertiesImp.h"
 #include "ui_DlgMaterialProperties.h"
 #include "ViewProvider.h"
 
diff --git a/src/Gui/DlgMaterialPropertiesImp.h b/src/Gui/Dialogs/DlgMaterialPropertiesImp.h
similarity index 100%
rename from src/Gui/DlgMaterialPropertiesImp.h
rename to src/Gui/Dialogs/DlgMaterialPropertiesImp.h
diff --git a/src/Gui/DlgObjectSelection.cpp b/src/Gui/Dialogs/DlgObjectSelection.cpp
similarity index 99%
rename from src/Gui/DlgObjectSelection.cpp
rename to src/Gui/Dialogs/DlgObjectSelection.cpp
index 1392ab3b472b..89869fc7f856 100644
--- a/src/Gui/DlgObjectSelection.cpp
+++ b/src/Gui/Dialogs/DlgObjectSelection.cpp
@@ -30,7 +30,7 @@
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 
-#include "DlgObjectSelection.h"
+#include "Dialogs/DlgObjectSelection.h"
 #include "ui_DlgObjectSelection.h"
 #include "Application.h"
 #include "MainWindow.h"
diff --git a/src/Gui/DlgObjectSelection.h b/src/Gui/Dialogs/DlgObjectSelection.h
similarity index 100%
rename from src/Gui/DlgObjectSelection.h
rename to src/Gui/Dialogs/DlgObjectSelection.h
diff --git a/src/Gui/DlgObjectSelection.ui b/src/Gui/Dialogs/DlgObjectSelection.ui
similarity index 100%
rename from src/Gui/DlgObjectSelection.ui
rename to src/Gui/Dialogs/DlgObjectSelection.ui
diff --git a/src/Gui/DlgOnlineHelp.ui b/src/Gui/Dialogs/DlgOnlineHelp.ui
similarity index 100%
rename from src/Gui/DlgOnlineHelp.ui
rename to src/Gui/Dialogs/DlgOnlineHelp.ui
diff --git a/src/Gui/DlgOnlineHelpImp.cpp b/src/Gui/Dialogs/DlgOnlineHelpImp.cpp
similarity index 96%
rename from src/Gui/DlgOnlineHelpImp.cpp
rename to src/Gui/Dialogs/DlgOnlineHelpImp.cpp
index a16cf2ec1e01..e0b8e9982ae8 100644
--- a/src/Gui/DlgOnlineHelpImp.cpp
+++ b/src/Gui/Dialogs/DlgOnlineHelpImp.cpp
@@ -28,7 +28,7 @@
 
 #include <App/Application.h>
 
-#include "DlgOnlineHelpImp.h"
+#include "Dialogs/DlgOnlineHelpImp.h"
 #include "ui_DlgOnlineHelp.h"
 
 
diff --git a/src/Gui/DlgOnlineHelpImp.h b/src/Gui/Dialogs/DlgOnlineHelpImp.h
similarity index 100%
rename from src/Gui/DlgOnlineHelpImp.h
rename to src/Gui/Dialogs/DlgOnlineHelpImp.h
diff --git a/src/Gui/DlgParameter.ui b/src/Gui/Dialogs/DlgParameter.ui
similarity index 100%
rename from src/Gui/DlgParameter.ui
rename to src/Gui/Dialogs/DlgParameter.ui
diff --git a/src/Gui/DlgParameterFind.cpp b/src/Gui/Dialogs/DlgParameterFind.cpp
similarity index 99%
rename from src/Gui/DlgParameterFind.cpp
rename to src/Gui/Dialogs/DlgParameterFind.cpp
index 9ec5c46dbf7d..1fb2dcdc8ca5 100644
--- a/src/Gui/DlgParameterFind.cpp
+++ b/src/Gui/Dialogs/DlgParameterFind.cpp
@@ -26,9 +26,9 @@
 #include <QPushButton>
 #endif
 
-#include "DlgParameterFind.h"
+#include "Dialogs/DlgParameterFind.h"
 #include "ui_DlgParameterFind.h"
-#include "DlgParameterImp.h"
+#include "Dialogs/DlgParameterImp.h"
 
 
 using namespace Gui::Dialog;
diff --git a/src/Gui/DlgParameterFind.h b/src/Gui/Dialogs/DlgParameterFind.h
similarity index 100%
rename from src/Gui/DlgParameterFind.h
rename to src/Gui/Dialogs/DlgParameterFind.h
diff --git a/src/Gui/DlgParameterFind.ui b/src/Gui/Dialogs/DlgParameterFind.ui
similarity index 100%
rename from src/Gui/DlgParameterFind.ui
rename to src/Gui/Dialogs/DlgParameterFind.ui
diff --git a/src/Gui/DlgParameterImp.cpp b/src/Gui/Dialogs/DlgParameterImp.cpp
similarity index 96%
rename from src/Gui/DlgParameterImp.cpp
rename to src/Gui/Dialogs/DlgParameterImp.cpp
index 51cc3e861fea..50a5e1501ba3 100644
--- a/src/Gui/DlgParameterImp.cpp
+++ b/src/Gui/Dialogs/DlgParameterImp.cpp
@@ -36,11 +36,11 @@
 #include <Base/Exception.h>
 #include <Base/Parameter.h>
 
-#include "DlgParameterImp.h"
+#include "Dialogs/DlgParameterImp.h"
 #include "ui_DlgParameter.h"
 #include "BitmapFactory.h"
-#include "DlgParameterFind.h"
-#include "DlgInputDialogImp.h"
+#include "Dialogs/DlgParameterFind.h"
+#include "Dialogs/DlgInputDialogImp.h"
 #include "FileDialog.h"
 #include "SpinBox.h"
 
diff --git a/src/Gui/DlgParameterImp.h b/src/Gui/Dialogs/DlgParameterImp.h
similarity index 100%
rename from src/Gui/DlgParameterImp.h
rename to src/Gui/Dialogs/DlgParameterImp.h
diff --git a/src/Gui/DlgPreferencePackManagement.ui b/src/Gui/Dialogs/DlgPreferencePackManagement.ui
similarity index 100%
rename from src/Gui/DlgPreferencePackManagement.ui
rename to src/Gui/Dialogs/DlgPreferencePackManagement.ui
diff --git a/src/Gui/DlgPreferencePackManagementImp.cpp b/src/Gui/Dialogs/DlgPreferencePackManagementImp.cpp
similarity index 99%
rename from src/Gui/DlgPreferencePackManagementImp.cpp
rename to src/Gui/Dialogs/DlgPreferencePackManagementImp.cpp
index 437f6105bab7..11b7f15a1583 100644
--- a/src/Gui/DlgPreferencePackManagementImp.cpp
+++ b/src/Gui/Dialogs/DlgPreferencePackManagementImp.cpp
@@ -25,7 +25,7 @@
 # include <QMessageBox>
 #endif
 
-#include "DlgPreferencePackManagementImp.h"
+#include "Dialogs/DlgPreferencePackManagementImp.h"
 #include "ui_DlgPreferencePackManagement.h"
 #include "Application.h"
 #include "Command.h"
diff --git a/src/Gui/DlgPreferencePackManagementImp.h b/src/Gui/Dialogs/DlgPreferencePackManagementImp.h
similarity index 100%
rename from src/Gui/DlgPreferencePackManagementImp.h
rename to src/Gui/Dialogs/DlgPreferencePackManagementImp.h
diff --git a/src/Gui/DlgPreferences.ui b/src/Gui/Dialogs/DlgPreferences.ui
similarity index 100%
rename from src/Gui/DlgPreferences.ui
rename to src/Gui/Dialogs/DlgPreferences.ui
diff --git a/src/Gui/DlgPreferencesImp.cpp b/src/Gui/Dialogs/DlgPreferencesImp.cpp
similarity index 96%
rename from src/Gui/DlgPreferencesImp.cpp
rename to src/Gui/Dialogs/DlgPreferencesImp.cpp
index c4e2c95eb6bc..23d968e3658b 100644
--- a/src/Gui/DlgPreferencesImp.cpp
+++ b/src/Gui/Dialogs/DlgPreferencesImp.cpp
@@ -47,7 +47,7 @@
 #include <Base/Exception.h>
 #include <Base/Tools.h>
 
-#include "DlgPreferencesImp.h"
+#include "Dialogs/DlgPreferencesImp.h"
 #include "ui_DlgPreferences.h"
 #include "BitmapFactory.h"
 #include "MainWindow.h"
diff --git a/src/Gui/DlgPreferencesImp.h b/src/Gui/Dialogs/DlgPreferencesImp.h
similarity index 100%
rename from src/Gui/DlgPreferencesImp.h
rename to src/Gui/Dialogs/DlgPreferencesImp.h
diff --git a/src/Gui/DlgProjectInformation.ui b/src/Gui/Dialogs/DlgProjectInformation.ui
similarity index 100%
rename from src/Gui/DlgProjectInformation.ui
rename to src/Gui/Dialogs/DlgProjectInformation.ui
diff --git a/src/Gui/DlgProjectInformationImp.cpp b/src/Gui/Dialogs/DlgProjectInformationImp.cpp
similarity index 97%
rename from src/Gui/DlgProjectInformationImp.cpp
rename to src/Gui/Dialogs/DlgProjectInformationImp.cpp
index 7505fb2ed4f1..7909f1612e0e 100644
--- a/src/Gui/DlgProjectInformationImp.cpp
+++ b/src/Gui/Dialogs/DlgProjectInformationImp.cpp
@@ -32,7 +32,7 @@
 #include <App/License.h>
 #include <Base/UnitsApi.h>
 
-#include "DlgProjectInformationImp.h"
+#include "Dialogs/DlgProjectInformationImp.h"
 #include "ui_DlgProjectInformation.h"
 
 #include "MainWindow.h"
diff --git a/src/Gui/DlgProjectInformationImp.h b/src/Gui/Dialogs/DlgProjectInformationImp.h
similarity index 100%
rename from src/Gui/DlgProjectInformationImp.h
rename to src/Gui/Dialogs/DlgProjectInformationImp.h
diff --git a/src/Gui/DlgProjectUtility.cpp b/src/Gui/Dialogs/DlgProjectUtility.cpp
similarity index 96%
rename from src/Gui/DlgProjectUtility.cpp
rename to src/Gui/Dialogs/DlgProjectUtility.cpp
index 75de3e8fe1ac..1a3da5315f3f 100644
--- a/src/Gui/DlgProjectUtility.cpp
+++ b/src/Gui/Dialogs/DlgProjectUtility.cpp
@@ -29,7 +29,7 @@
 
 #include <App/Document.h>
 
-#include "DlgProjectUtility.h"
+#include "Dialogs/DlgProjectUtility.h"
 #include "ui_DlgProjectUtility.h"
 #include "Application.h"
 #include "Command.h"
diff --git a/src/Gui/DlgProjectUtility.h b/src/Gui/Dialogs/DlgProjectUtility.h
similarity index 100%
rename from src/Gui/DlgProjectUtility.h
rename to src/Gui/Dialogs/DlgProjectUtility.h
diff --git a/src/Gui/DlgProjectUtility.ui b/src/Gui/Dialogs/DlgProjectUtility.ui
similarity index 100%
rename from src/Gui/DlgProjectUtility.ui
rename to src/Gui/Dialogs/DlgProjectUtility.ui
diff --git a/src/Gui/DlgPropertyLink.cpp b/src/Gui/Dialogs/DlgPropertyLink.cpp
similarity index 99%
rename from src/Gui/DlgPropertyLink.cpp
rename to src/Gui/Dialogs/DlgPropertyLink.cpp
index 869d541670f3..1c41b465cc02 100644
--- a/src/Gui/DlgPropertyLink.cpp
+++ b/src/Gui/Dialogs/DlgPropertyLink.cpp
@@ -36,7 +36,7 @@
 #include <Base/Interpreter.h>
 #include <Base/Tools.h>
 
-#include "DlgPropertyLink.h"
+#include "Dialogs/DlgPropertyLink.h"
 #include "ui_DlgPropertyLink.h"
 #include "Application.h"
 #include "Document.h"
diff --git a/src/Gui/DlgPropertyLink.h b/src/Gui/Dialogs/DlgPropertyLink.h
similarity index 100%
rename from src/Gui/DlgPropertyLink.h
rename to src/Gui/Dialogs/DlgPropertyLink.h
diff --git a/src/Gui/DlgPropertyLink.ui b/src/Gui/Dialogs/DlgPropertyLink.ui
similarity index 100%
rename from src/Gui/DlgPropertyLink.ui
rename to src/Gui/Dialogs/DlgPropertyLink.ui
diff --git a/src/Gui/DlgRevertToBackupConfig.ui b/src/Gui/Dialogs/DlgRevertToBackupConfig.ui
similarity index 100%
rename from src/Gui/DlgRevertToBackupConfig.ui
rename to src/Gui/Dialogs/DlgRevertToBackupConfig.ui
diff --git a/src/Gui/DlgRevertToBackupConfigImp.cpp b/src/Gui/Dialogs/DlgRevertToBackupConfigImp.cpp
similarity index 98%
rename from src/Gui/DlgRevertToBackupConfigImp.cpp
rename to src/Gui/Dialogs/DlgRevertToBackupConfigImp.cpp
index 2910fbea262a..d82f4f6921cf 100644
--- a/src/Gui/DlgRevertToBackupConfigImp.cpp
+++ b/src/Gui/Dialogs/DlgRevertToBackupConfigImp.cpp
@@ -26,7 +26,7 @@
 # include <QPushButton>
 #endif
 
-#include "DlgRevertToBackupConfigImp.h"
+#include "Dialogs/DlgRevertToBackupConfigImp.h"
 #include "ui_DlgRevertToBackupConfig.h"
 #include "Application.h"
 #include "PreferencePackManager.h"
diff --git a/src/Gui/DlgRevertToBackupConfigImp.h b/src/Gui/Dialogs/DlgRevertToBackupConfigImp.h
similarity index 100%
rename from src/Gui/DlgRevertToBackupConfigImp.h
rename to src/Gui/Dialogs/DlgRevertToBackupConfigImp.h
diff --git a/src/Gui/DlgRunExternal.cpp b/src/Gui/Dialogs/DlgRunExternal.cpp
similarity index 96%
rename from src/Gui/DlgRunExternal.cpp
rename to src/Gui/Dialogs/DlgRunExternal.cpp
index 0bcdfe6bf513..2d82690a20a6 100644
--- a/src/Gui/DlgRunExternal.cpp
+++ b/src/Gui/Dialogs/DlgRunExternal.cpp
@@ -25,7 +25,7 @@
 #include <QFileDialog>
 #endif
 
-#include "DlgRunExternal.h"
+#include "Dialogs/DlgRunExternal.h"
 #include "ui_DlgRunExternal.h"
 #include "FileDialog.h"
 
diff --git a/src/Gui/DlgRunExternal.h b/src/Gui/Dialogs/DlgRunExternal.h
similarity index 100%
rename from src/Gui/DlgRunExternal.h
rename to src/Gui/Dialogs/DlgRunExternal.h
diff --git a/src/Gui/DlgRunExternal.ui b/src/Gui/Dialogs/DlgRunExternal.ui
similarity index 100%
rename from src/Gui/DlgRunExternal.ui
rename to src/Gui/Dialogs/DlgRunExternal.ui
diff --git a/src/Gui/DlgSettingsColorGradient.ui b/src/Gui/Dialogs/DlgSettingsColorGradient.ui
similarity index 100%
rename from src/Gui/DlgSettingsColorGradient.ui
rename to src/Gui/Dialogs/DlgSettingsColorGradient.ui
diff --git a/src/Gui/DlgSettingsColorGradientImp.cpp b/src/Gui/Dialogs/DlgSettingsColorGradientImp.cpp
similarity index 96%
rename from src/Gui/DlgSettingsColorGradientImp.cpp
rename to src/Gui/Dialogs/DlgSettingsColorGradientImp.cpp
index 5979f363f286..f63a5fc0fcd5 100644
--- a/src/Gui/DlgSettingsColorGradientImp.cpp
+++ b/src/Gui/Dialogs/DlgSettingsColorGradientImp.cpp
@@ -31,7 +31,7 @@
 #include <QMessageBox>
 #endif
 
-#include "DlgSettingsColorGradientImp.h"
+#include "Dialogs/DlgSettingsColorGradientImp.h"
 #include "ui_DlgSettingsColorGradient.h"
 #include "SpinBox.h"
 #include "Tools.h"
diff --git a/src/Gui/DlgSettingsColorGradientImp.h b/src/Gui/Dialogs/DlgSettingsColorGradientImp.h
similarity index 100%
rename from src/Gui/DlgSettingsColorGradientImp.h
rename to src/Gui/Dialogs/DlgSettingsColorGradientImp.h
diff --git a/src/Gui/DlgSettingsImage.ui b/src/Gui/Dialogs/DlgSettingsImage.ui
similarity index 100%
rename from src/Gui/DlgSettingsImage.ui
rename to src/Gui/Dialogs/DlgSettingsImage.ui
diff --git a/src/Gui/DlgSettingsImageImp.cpp b/src/Gui/Dialogs/DlgSettingsImageImp.cpp
similarity index 96%
rename from src/Gui/DlgSettingsImageImp.cpp
rename to src/Gui/Dialogs/DlgSettingsImageImp.cpp
index 659c34f9b161..85692b924630 100644
--- a/src/Gui/DlgSettingsImageImp.cpp
+++ b/src/Gui/Dialogs/DlgSettingsImageImp.cpp
@@ -26,7 +26,7 @@
 #include <QRegularExpressionMatch>
 #endif
 
-#include "DlgSettingsImageImp.h"
+#include "Dialogs/DlgSettingsImageImp.h"
 #include "ui_DlgSettingsImage.h"
 
 
diff --git a/src/Gui/DlgSettingsImageImp.h b/src/Gui/Dialogs/DlgSettingsImageImp.h
similarity index 100%
rename from src/Gui/DlgSettingsImageImp.h
rename to src/Gui/Dialogs/DlgSettingsImageImp.h
diff --git a/src/Gui/DlgToolbars.ui b/src/Gui/Dialogs/DlgToolbars.ui
similarity index 97%
rename from src/Gui/DlgToolbars.ui
rename to src/Gui/Dialogs/DlgToolbars.ui
index 910985b74820..0a4700fbc332 100644
--- a/src/Gui/DlgToolbars.ui
+++ b/src/Gui/Dialogs/DlgToolbars.ui
@@ -113,7 +113,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="Icons/resource.qrc">
+            <iconset resource="../Icons/resource.qrc">
              <normaloff>:/icons/button_right.svg</normaloff>:/icons/button_right.svg</iconset>
            </property>
           </widget>
@@ -139,7 +139,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="Icons/resource.qrc">
+            <iconset resource="../Icons/resource.qrc">
              <normaloff>:/icons/button_left.svg</normaloff>:/icons/button_left.svg</iconset>
            </property>
            <property name="autoDefault">
@@ -171,7 +171,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="Icons/resource.qrc">
+            <iconset resource="../Icons/resource.qrc">
              <normaloff>:/icons/button_up.svg</normaloff>:/icons/button_up.svg</iconset>
            </property>
           </widget>
@@ -197,7 +197,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="Icons/resource.qrc">
+            <iconset resource="../Icons/resource.qrc">
              <normaloff>:/icons/button_down.svg</normaloff>:/icons/button_down.svg</iconset>
            </property>
            <property name="autoDefault">
@@ -352,7 +352,7 @@
   <tabstop>deleteButton</tabstop>
  </tabstops>
  <resources>
-  <include location="Icons/resource.qrc"/>
+  <include location="../Icons/resource.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/Gui/DlgToolbarsImp.cpp b/src/Gui/Dialogs/DlgToolbarsImp.cpp
similarity index 97%
rename from src/Gui/DlgToolbarsImp.cpp
rename to src/Gui/Dialogs/DlgToolbarsImp.cpp
index b317d4c9e8d4..65ce63c0e2d6 100644
--- a/src/Gui/DlgToolbarsImp.cpp
+++ b/src/Gui/Dialogs/DlgToolbarsImp.cpp
@@ -30,8 +30,8 @@
 #include <QToolButton>
 #endif
 
-#include "DlgToolbarsImp.h"
-#include "DlgKeyboardImp.h"
+#include "Dialogs/DlgToolbarsImp.h"
+#include "Dialogs/DlgKeyboardImp.h"
 #include "ui_DlgToolbars.h"
 #include "Application.h"
 #include "BitmapFactory.h"
diff --git a/src/Gui/DlgToolbarsImp.h b/src/Gui/Dialogs/DlgToolbarsImp.h
similarity index 100%
rename from src/Gui/DlgToolbarsImp.h
rename to src/Gui/Dialogs/DlgToolbarsImp.h
diff --git a/src/Gui/DlgTreeWidget.ui b/src/Gui/Dialogs/DlgTreeWidget.ui
similarity index 100%
rename from src/Gui/DlgTreeWidget.ui
rename to src/Gui/Dialogs/DlgTreeWidget.ui
diff --git a/src/Gui/DlgUndoRedo.cpp b/src/Gui/Dialogs/DlgUndoRedo.cpp
similarity index 96%
rename from src/Gui/DlgUndoRedo.cpp
rename to src/Gui/Dialogs/DlgUndoRedo.cpp
index 64190bcc138a..439c0a153209 100644
--- a/src/Gui/DlgUndoRedo.cpp
+++ b/src/Gui/Dialogs/DlgUndoRedo.cpp
@@ -27,7 +27,7 @@
 #include <QList>
 #endif
 
-#include "DlgUndoRedo.h"
+#include "Dialogs/DlgUndoRedo.h"
 #include "Application.h"
 #include "MainWindow.h"
 #include "MDIView.h"
diff --git a/src/Gui/DlgUndoRedo.h b/src/Gui/Dialogs/DlgUndoRedo.h
similarity index 100%
rename from src/Gui/DlgUndoRedo.h
rename to src/Gui/Dialogs/DlgUndoRedo.h
diff --git a/src/Gui/DlgUnitsCalculator.ui b/src/Gui/Dialogs/DlgUnitsCalculator.ui
similarity index 100%
rename from src/Gui/DlgUnitsCalculator.ui
rename to src/Gui/Dialogs/DlgUnitsCalculator.ui
diff --git a/src/Gui/DlgUnitsCalculatorImp.cpp b/src/Gui/Dialogs/DlgUnitsCalculatorImp.cpp
similarity index 99%
rename from src/Gui/DlgUnitsCalculatorImp.cpp
rename to src/Gui/Dialogs/DlgUnitsCalculatorImp.cpp
index c1a0276c725a..255b4d570487 100644
--- a/src/Gui/DlgUnitsCalculatorImp.cpp
+++ b/src/Gui/Dialogs/DlgUnitsCalculatorImp.cpp
@@ -28,7 +28,7 @@
 #include <QLocale>
 #endif
 
-#include "DlgUnitsCalculatorImp.h"
+#include "Dialogs/DlgUnitsCalculatorImp.h"
 #include "ui_DlgUnitsCalculator.h"
 #include <Base/UnitsApi.h>
 
diff --git a/src/Gui/DlgUnitsCalculatorImp.h b/src/Gui/Dialogs/DlgUnitsCalculatorImp.h
similarity index 100%
rename from src/Gui/DlgUnitsCalculatorImp.h
rename to src/Gui/Dialogs/DlgUnitsCalculatorImp.h
diff --git a/src/Gui/DocumentRecovery.cpp b/src/Gui/DocumentRecovery.cpp
index c839a4248121..9685f253931f 100644
--- a/src/Gui/DocumentRecovery.cpp
+++ b/src/Gui/DocumentRecovery.cpp
@@ -52,7 +52,7 @@
 #include <Base/Exception.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
-#include <Gui/DlgCheckableMessageBox.h>
+#include <Gui/Dialogs/DlgCheckableMessageBox.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 
diff --git a/src/Gui/DownloadItem.cpp b/src/Gui/DownloadItem.cpp
index 8831de18681b..1ef9e9d0ed6a 100644
--- a/src/Gui/DownloadItem.cpp
+++ b/src/Gui/DownloadItem.cpp
@@ -45,7 +45,7 @@
 #include "DownloadManager.h"
 #include "FileDialog.h"
 #include "MainWindow.h"
-#include "ui_DlgAuthorization.h"
+#include "Dialogs/ui_DlgAuthorization.h"
 #include "Tools.h"
 #include <App/Document.h>
 
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 6c1b1a7fa611..18ae3e4455a2 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -114,7 +114,7 @@
 #include "SpaceballEvent.h"
 #include "View3DInventor.h"
 #include "View3DInventorViewer.h"
-#include "DlgObjectSelection.h"
+#include "Dialogs/DlgObjectSelection.h"
 #include <App/Color.h>
 
 FC_LOG_LEVEL_INIT("MainWindow",false,true,true)
diff --git a/src/Gui/NetworkRetriever.cpp b/src/Gui/NetworkRetriever.cpp
index 8b71ff095181..47ffa5856fe4 100644
--- a/src/Gui/NetworkRetriever.cpp
+++ b/src/Gui/NetworkRetriever.cpp
@@ -39,7 +39,7 @@
 #include "BitmapFactory.h"
 #include "FileDialog.h"
 #include "MainWindow.h"
-#include "ui_DlgAuthorization.h"
+#include "Dialogs/ui_DlgAuthorization.h"
 
 
 using namespace Gui;
diff --git a/src/Gui/PreferencePages/DlgSettingsGeneral.cpp b/src/Gui/PreferencePages/DlgSettingsGeneral.cpp
index 4ae81c7de11e..6f370c719f3f 100644
--- a/src/Gui/PreferencePages/DlgSettingsGeneral.cpp
+++ b/src/Gui/PreferencePages/DlgSettingsGeneral.cpp
@@ -45,10 +45,10 @@
 
 #include <Gui/Action.h>
 #include <Gui/Application.h>
-#include <Gui/DlgCreateNewPreferencePackImp.h>
-#include <Gui/DlgPreferencesImp.h>
-#include <Gui/DlgPreferencePackManagementImp.h>
-#include <Gui/DlgRevertToBackupConfigImp.h>
+#include <Gui/Dialogs/DlgCreateNewPreferencePackImp.h>
+#include <Gui/Dialogs/DlgPreferencesImp.h>
+#include <Gui/Dialogs/DlgPreferencePackManagementImp.h>
+#include <Gui/Dialogs/DlgRevertToBackupConfigImp.h>
 #include <Gui/MainWindow.h>
 #include <Gui/OverlayManager.h>
 #include <Gui/ParamHandler.h>
diff --git a/src/Gui/ListWidgetDragBugFix.cpp b/src/Gui/PreferencePages/ListWidgetDragBugFix.cpp
similarity index 100%
rename from src/Gui/ListWidgetDragBugFix.cpp
rename to src/Gui/PreferencePages/ListWidgetDragBugFix.cpp
diff --git a/src/Gui/ListWidgetDragBugFix.h b/src/Gui/PreferencePages/ListWidgetDragBugFix.h
similarity index 100%
rename from src/Gui/ListWidgetDragBugFix.h
rename to src/Gui/PreferencePages/ListWidgetDragBugFix.h
diff --git a/src/Gui/QuantitySpinBox.cpp b/src/Gui/QuantitySpinBox.cpp
index 1ab6a81e841a..e881db68a2a7 100644
--- a/src/Gui/QuantitySpinBox.cpp
+++ b/src/Gui/QuantitySpinBox.cpp
@@ -48,7 +48,7 @@
 #include "QuantitySpinBox.h"
 #include "QuantitySpinBox_p.h"
 #include "Command.h"
-#include "DlgExpressionInput.h"
+#include "Dialogs/DlgExpressionInput.h"
 #include "Tools.h"
 
 
diff --git a/src/Gui/SoFCColorGradient.cpp b/src/Gui/SoFCColorGradient.cpp
index e0f4ee8321bf..706d067a14f7 100644
--- a/src/Gui/SoFCColorGradient.cpp
+++ b/src/Gui/SoFCColorGradient.cpp
@@ -39,7 +39,7 @@
 #include <Base/Parameter.h>
 #include "SoFCColorGradient.h"
 #include "SoTextLabel.h"
-#include "DlgSettingsColorGradientImp.h"
+#include "Dialogs/DlgSettingsColorGradientImp.h"
 #include "MainWindow.h"
 #include "MDIView.h"
 #include "ViewProvider.h"
diff --git a/src/Gui/SpinBox.cpp b/src/Gui/SpinBox.cpp
index 2d65a55d176f..df16236b5d6f 100644
--- a/src/Gui/SpinBox.cpp
+++ b/src/Gui/SpinBox.cpp
@@ -38,7 +38,7 @@
 
 #include "SpinBox.h"
 #include "Command.h"
-#include "DlgExpressionInput.h"
+#include "Dialogs/DlgExpressionInput.h"
 #include "QuantitySpinBox_p.h"
 
 
diff --git a/src/Gui/StartupProcess.cpp b/src/Gui/StartupProcess.cpp
index 0e1a0112094d..e992c2d37cab 100644
--- a/src/Gui/StartupProcess.cpp
+++ b/src/Gui/StartupProcess.cpp
@@ -37,7 +37,7 @@
 #include "StartupProcess.h"
 #include "Application.h"
 #include "AutoSaver.h"
-#include "DlgCheckableMessageBox.h"
+#include "Dialogs/DlgCheckableMessageBox.h"
 #include "FileDialog.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
diff --git a/src/Gui/TaskDlgRelocation.cpp b/src/Gui/TaskDlgRelocation.cpp
index 01d90432c72f..c6008264a407 100644
--- a/src/Gui/TaskDlgRelocation.cpp
+++ b/src/Gui/TaskDlgRelocation.cpp
@@ -22,8 +22,8 @@
 
 #include "PreCompiled.h"
 
-#include "ui_DlgLocationAngle.h"
-#include "ui_DlgLocationPos.h"
+#include "Dialogs/ui_DlgLocationAngle.h"
+#include "Dialogs/ui_DlgLocationPos.h"
 
 #include "TaskDlgRelocation.h"
 #include "BitmapFactory.h"
diff --git a/src/Gui/ViewProviderLink.cpp b/src/Gui/ViewProviderLink.cpp
index 9ee4e070cc67..68b61e2c52db 100644
--- a/src/Gui/ViewProviderLink.cpp
+++ b/src/Gui/ViewProviderLink.cpp
@@ -74,7 +74,7 @@
 
 #include "ActionFunction.h"
 #include "Command.h"
-#include "DlgObjectSelection.h"
+#include "Dialogs/DlgObjectSelection.h"
 
 FC_LOG_LEVEL_INIT("App::Link", true, true)
 
diff --git a/src/Gui/ViewProviderVarSet.h b/src/Gui/ViewProviderVarSet.h
index 715a05a43852..6afa7b975ec6 100644
--- a/src/Gui/ViewProviderVarSet.h
+++ b/src/Gui/ViewProviderVarSet.h
@@ -24,7 +24,7 @@
 #define GUI_ViewProviderVarSet_H
 
 #include "ViewProviderDocumentObject.h"
-#include "DlgAddPropertyVarSet.h"
+#include "Dialogs/DlgAddPropertyVarSet.h"
 
 namespace Gui {
 
diff --git a/src/Gui/WidgetFactory.h b/src/Gui/WidgetFactory.h
index 3a6e5fe76dea..71418c48d5ca 100644
--- a/src/Gui/WidgetFactory.h
+++ b/src/Gui/WidgetFactory.h
@@ -27,8 +27,8 @@
 #include <vector>
 
 #include <Base/Factory.h>
-#include "DlgCustomizeImp.h"
-#include "DlgPreferencesImp.h"
+#include "Dialogs/DlgCustomizeImp.h"
+#include "Dialogs/DlgPreferencesImp.h"
 #include "PropertyPage.h"
 #include <CXX/Extensions.hxx>
 
diff --git a/src/Gui/Widgets.cpp b/src/Gui/Widgets.cpp
index 990fe6131082..cdac6c55e3ce 100644
--- a/src/Gui/Widgets.cpp
+++ b/src/Gui/Widgets.cpp
@@ -50,11 +50,11 @@
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "Command.h"
-#include "DlgExpressionInput.h"
+#include "Dialogs/DlgExpressionInput.h"
 #include "PrefWidgets.h"
 #include "QuantitySpinBox_p.h"
 #include "Tools.h"
-#include "ui_DlgTreeWidget.h"
+#include "Dialogs/ui_DlgTreeWidget.h"
 
 using namespace Gui;
 using namespace App;
diff --git a/src/Gui/WorkbenchSelector.cpp b/src/Gui/WorkbenchSelector.cpp
index a96a53070235..88c552adc6d6 100644
--- a/src/Gui/WorkbenchSelector.cpp
+++ b/src/Gui/WorkbenchSelector.cpp
@@ -38,7 +38,7 @@
 #include "Action.h"
 #include "BitmapFactory.h"
 #include "Command.h"
-#include "DlgPreferencesImp.h"
+#include "Dialogs/DlgPreferencesImp.h"
 #include "MainWindow.h"
 #include "WorkbenchSelector.h"
 #include "ToolBarAreaWidget.h"
diff --git a/src/Gui/propertyeditor/PropertyEditor.cpp b/src/Gui/propertyeditor/PropertyEditor.cpp
index 561c7f9916c2..4b4822708dee 100644
--- a/src/Gui/propertyeditor/PropertyEditor.cpp
+++ b/src/Gui/propertyeditor/PropertyEditor.cpp
@@ -39,7 +39,7 @@
 #include <Base/Tools.h>
 
 #include "PropertyEditor.h"
-#include "DlgAddProperty.h"
+#include "Dialogs/DlgAddProperty.h"
 #include "MainWindow.h"
 #include "PropertyItemDelegate.h"
 #include "PropertyModel.h"
diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp
index e506926b5b34..de4de218659d 100644
--- a/src/Gui/propertyeditor/PropertyItem.cpp
+++ b/src/Gui/propertyeditor/PropertyItem.cpp
@@ -53,7 +53,7 @@
 #include <Base/Tools.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
-#include <Gui/DlgPropertyLink.h>
+#include <Gui/Dialogs/DlgPropertyLink.h>
 #include <Gui/FileDialog.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Placement.h>
diff --git a/src/Gui/resource.cpp b/src/Gui/resource.cpp
index 41d6c35e3d83..cdf3485ccd82 100644
--- a/src/Gui/resource.cpp
+++ b/src/Gui/resource.cpp
@@ -29,7 +29,7 @@
 
 // INCLUDE YOUR PREFERENCE PAGES HERE
 //
-#include "DlgPreferencesImp.h"
+#include "Dialogs/DlgPreferencesImp.h"
 #include "PreferencePages/DlgSettings3DViewImp.h"
 #include "PreferencePages/DlgSettingsCacheDirectory.h"
 #include "PreferencePages/DlgSettingsDocumentImp.h"
@@ -47,13 +47,13 @@
 #include "PreferencePages/DlgSettingsWorkbenchesImp.h"
 #include "PreferencePages/DlgSettingsAdvanced.h"
 
-#include "DlgToolbarsImp.h"
-#include "DlgActionsImp.h"
-#include "DlgKeyboardImp.h"
+#include "Dialogs/DlgToolbarsImp.h"
+#include "Dialogs/DlgActionsImp.h"
+#include "Dialogs/DlgKeyboardImp.h"
 
 #if defined(_USE_3DCONNEXION_SDK) || defined(SPNAV_FOUND)
-#include "DlgCustomizeSpaceball.h"
-#include "DlgCustomizeSpNavSettings.h"
+#include "Dialogs/DlgCustomizeSpaceball.h"
+#include "Dialogs/DlgCustomizeSpNavSettings.h"
 #endif
 
 #include "InputField.h"
diff --git a/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp b/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp
index a41899b6e45d..090d723e24a7 100644
--- a/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp
+++ b/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp
@@ -29,7 +29,7 @@
 
 #include <Base/Console.h>
 #include <Gui/Application.h>
-#include <Gui/DlgMaterialPropertiesImp.h>
+#include <Gui/Dialogs/DlgMaterialPropertiesImp.h>
 #include <Gui/DockWindowManager.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp
index 3c6cc8845f88..04b50bdedfc2 100644
--- a/src/Mod/Part/Gui/AppPartGui.cpp
+++ b/src/Mod/Part/Gui/AppPartGui.cpp
@@ -31,7 +31,7 @@
 #include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/DlgPreferencesImp.h>
+#include <Gui/Dialogs/DlgPreferencesImp.h>
 #include <Gui/WidgetFactory.h>
 #include <Gui/Language/Translator.h>
 
diff --git a/src/Mod/Part/Gui/TaskFaceAppearances.cpp b/src/Mod/Part/Gui/TaskFaceAppearances.cpp
index f1983229ba66..a8a5b177481f 100644
--- a/src/Mod/Part/Gui/TaskFaceAppearances.cpp
+++ b/src/Mod/Part/Gui/TaskFaceAppearances.cpp
@@ -46,7 +46,7 @@
 #include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/Control.h>
-#include <Gui/DlgMaterialPropertiesImp.h>
+#include <Gui/Dialogs/DlgMaterialPropertiesImp.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
index 82af650761e1..0b5963acd92a 100644
--- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
@@ -36,7 +36,7 @@
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/CommandT.h>
-#include <Gui/DlgCheckableMessageBox.h>
+#include <Gui/Dialogs/DlgCheckableMessageBox.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Notifications.h>