9 files changed, 9 insertions, 8 deletions
diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt
index 8705f914..761f8e96 100644
--- a/muse2/muse/CMakeLists.txt
+++ b/muse2/muse/CMakeLists.txt
@@ -233,6 +233,7 @@ target_link_libraries(core
       synti       
       waveedit
       widgets 
+      widgets_functiondialogs
       
       ${QT_LIBRARIES}
       ${SNDFILE_LIBRARIES}
diff --git a/muse2/muse/functions.h b/muse2/muse/functions.h
index a0228831..9987958b 100644
--- a/muse2/muse/functions.h
+++ b/muse2/muse/functions.h
@@ -9,9 +9,9 @@
 #define __FUNCTIONS_H__
 
 #include "velocity.h"
-#include "quantize.h"
+#include "widgets/function_dialogs/quantize.h"
 #include "crescendo.h"
-#include "gatetime.h"
+#include "widgets/function_dialogs/gatetime.h"
 #include "remove.h"
 #include "transpose.h"
 #include "setlen.h"
diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt
index c8415d73..2d848ab0 100644
--- a/muse2/muse/widgets/CMakeLists.txt
+++ b/muse2/muse/widgets/CMakeLists.txt
@@ -18,6 +18,12 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
+set (SubDirs 
+      function_dialogs 
+      )
+
+subdirs (${SubDirs})
+
 ##
 ## Expand Qt macros in source files
 ##
@@ -35,7 +41,6 @@ QT4_WRAP_CPP (widget_mocs
       didyouknow.h
       doublelabel.h  
       filedialog.h  
-      gatetime.h  
       genset.h  
       header.h  
       hitscale.h  
@@ -77,7 +82,6 @@ QT4_WRAP_CPP (widget_mocs
       ttoolbutton.h  
       unusedwavefiles.h
       velocity.h
-      quantize.h  
       crescendo.h  
       move.h  
       remove.h  
@@ -103,7 +107,6 @@ file (GLOB widgets_ui_files
       editnotedialogbase.ui  
       editsysexdialogbase.ui  
       fdialogbuttons.ui  
-      gatetimebase.ui  
       gensetbase.ui  
       itransformbase.ui  
       metronomebase.ui  
@@ -120,7 +123,6 @@ file (GLOB widgets_ui_files
       transposebase.ui
       unusedwavefiles.ui
       velocitybase.ui
-      quantbase.ui
       crescendobase.ui
       movebase.ui
       removebase.ui
@@ -148,7 +150,6 @@ file (GLOB widgets_source_files
       doublelabel.cpp 
       drange.cpp
       filedialog.cpp 
-      gatetime.cpp 
       genset.cpp 
       header.cpp 
       hitscale.cpp 
@@ -194,7 +195,6 @@ file (GLOB widgets_source_files
       unusedwavefiles.cpp
       utils.cpp
       velocity.cpp 
-      quantize.cpp 
       crescendo.cpp 
       move.cpp 
       remove.cpp 
diff --git a/muse2/muse/widgets/gatetime.cpp b/muse2/muse/widgets/function_dialogs/gatetime.cpp
index 9448ab1c..9448ab1c 100644
--- a/muse2/muse/widgets/gatetime.cpp
+++ b/muse2/muse/widgets/function_dialogs/gatetime.cpp
diff --git a/muse2/muse/widgets/gatetime.h b/muse2/muse/widgets/function_dialogs/gatetime.h
index d2555872..d2555872 100644
--- a/muse2/muse/widgets/gatetime.h
+++ b/muse2/muse/widgets/function_dialogs/gatetime.h
diff --git a/muse2/muse/widgets/gatetimebase.ui b/muse2/muse/widgets/function_dialogs/gatetimebase.ui
index e804de17..e804de17 100644
--- a/muse2/muse/widgets/gatetimebase.ui
+++ b/muse2/muse/widgets/function_dialogs/gatetimebase.ui
diff --git a/muse2/muse/widgets/quantbase.ui b/muse2/muse/widgets/function_dialogs/quantbase.ui
index 6a88c86f..6a88c86f 100644
--- a/muse2/muse/widgets/quantbase.ui
+++ b/muse2/muse/widgets/function_dialogs/quantbase.ui
diff --git a/muse2/muse/widgets/quantize.cpp b/muse2/muse/widgets/function_dialogs/quantize.cpp
index 111087c2..111087c2 100644
--- a/muse2/muse/widgets/quantize.cpp
+++ b/muse2/muse/widgets/function_dialogs/quantize.cpp
diff --git a/muse2/muse/widgets/quantize.h b/muse2/muse/widgets/function_dialogs/quantize.h
index 399e2545..399e2545 100644
--- a/muse2/muse/widgets/quantize.h
+++ b/muse2/muse/widgets/function_dialogs/quantize.h