diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx
index ddbebfa48..b939ff85c 100644
--- a/fluid/Fl_Type.cxx
+++ b/fluid/Fl_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Type.cxx,v 1.6.2.6.2.11 2002/10/31 18:48:54 matthiaswm Exp $"
+// "$Id: Fl_Type.cxx,v 1.6.2.6.2.12 2002/11/01 01:37:57 easysw Exp $"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -45,57 +45,57 @@
 #include "Fl_Type.h"
 
 #include <FL/Fl_Pixmap.H>
-#include "lock.xpm"
-//#include "unlock.xpm"
+#include "pixmaps/lock.xpm"
+//#include "pixmaps/unlock.xpm"
 
 static Fl_Pixmap	lock_pixmap(lock_xpm);
 //static Fl_Pixmap	unlock_pixmap(unlock_xpm);
 
-#include "flWindow.xpm"
-#include "flButton.xpm"
-#include "flCheckButton.xpm"
-#include "flRoundButton.xpm"
-#include "flBox.xpm"
-#include "flGroup.xpm"
-#include "flFunction.xpm"
-#include "flCode.xpm"
-#include "flCodeBlock.xpm"
-#include "flDeclaration.xpm"
-#include "flDeclarationBlock.xpm"
-#include "flClass.xpm"
-#include "flTabs.xpm"
-#include "flInput.xpm"
-#include "flChoice.xpm"
-#include "flMenuitem.xpm"
-#include "flMenubar.xpm"
-#include "flSubmenu.xpm"
-#include "flScroll.xpm"
-#include "flTile.xpm"
-#include "flWizard.xpm"
-#include "flPack.xpm"
-#include "flReturnButton.xpm"
-#include "flLightButton.xpm"
-#include "flRepeatButton.xpm"
-#include "flMenuButton.xpm"
-#include "flOutput.xpm"
-#include "flTextDisplay.xpm"
-#include "flTextEdit.xpm"
-#include "flFileInput.xpm"
-#include "flBrowser.xpm"
-#include "flCheckBrowser.xpm"
-#include "flFileBrowser.xpm"
-#include "flClock.xpm"
-#include "flHelp.xpm"
-#include "flProgress.xpm"
-#include "flSlider.xpm"
-#include "flScrollBar.xpm"
-#include "flValueSlider.xpm"
-#include "flAdjuster.xpm"
-#include "flCounter.xpm"
-#include "flDial.xpm"
-#include "flRoller.xpm"
-#include "flValueInput.xpm"
-#include "flValueOutput.xpm"
+#include "pixmaps/flWindow.xpm"
+#include "pixmaps/flButton.xpm"
+#include "pixmaps/flCheckButton.xpm"
+#include "pixmaps/flRoundButton.xpm"
+#include "pixmaps/flBox.xpm"
+#include "pixmaps/flGroup.xpm"
+#include "pixmaps/flFunction.xpm"
+#include "pixmaps/flCode.xpm"
+#include "pixmaps/flCodeBlock.xpm"
+#include "pixmaps/flDeclaration.xpm"
+#include "pixmaps/flDeclarationBlock.xpm"
+#include "pixmaps/flClass.xpm"
+#include "pixmaps/flTabs.xpm"
+#include "pixmaps/flInput.xpm"
+#include "pixmaps/flChoice.xpm"
+#include "pixmaps/flMenuitem.xpm"
+#include "pixmaps/flMenubar.xpm"
+#include "pixmaps/flSubmenu.xpm"
+#include "pixmaps/flScroll.xpm"
+#include "pixmaps/flTile.xpm"
+#include "pixmaps/flWizard.xpm"
+#include "pixmaps/flPack.xpm"
+#include "pixmaps/flReturnButton.xpm"
+#include "pixmaps/flLightButton.xpm"
+#include "pixmaps/flRepeatButton.xpm"
+#include "pixmaps/flMenuButton.xpm"
+#include "pixmaps/flOutput.xpm"
+#include "pixmaps/flTextDisplay.xpm"
+#include "pixmaps/flTextEdit.xpm"
+#include "pixmaps/flFileInput.xpm"
+#include "pixmaps/flBrowser.xpm"
+#include "pixmaps/flCheckBrowser.xpm"
+#include "pixmaps/flFileBrowser.xpm"
+#include "pixmaps/flClock.xpm"
+#include "pixmaps/flHelp.xpm"
+#include "pixmaps/flProgress.xpm"
+#include "pixmaps/flSlider.xpm"
+#include "pixmaps/flScrollBar.xpm"
+#include "pixmaps/flValueSlider.xpm"
+#include "pixmaps/flAdjuster.xpm"
+#include "pixmaps/flCounter.xpm"
+#include "pixmaps/flDial.xpm"
+#include "pixmaps/flRoller.xpm"
+#include "pixmaps/flValueInput.xpm"
+#include "pixmaps/flValueOutput.xpm"
 
 static Fl_Pixmap	window_pixmap(flWindow_xpm);
 static Fl_Pixmap	button_pixmap(flButton_xpm);
@@ -784,5 +784,5 @@ void Fl_Type::read_property(const char *c) {
 int Fl_Type::read_fdesign(const char*, const char*) {return 0;}
 
 //
-// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.11 2002/10/31 18:48:54 matthiaswm Exp $".
+// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.12 2002/11/01 01:37:57 easysw Exp $".
 //
diff --git a/fluid/makedepend b/fluid/makedepend
index 102eebd13..ae908bd16 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -13,7 +13,7 @@ Fl_Function_Type.o: ../FL/Fl_Export.H ../config.h function_panel.h
 Fl_Function_Type.o: ../FL/Fl_Window.H ../FL/Fl_Light_Button.H
 Fl_Function_Type.o: ../FL/Fl_Button.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 Fl_Function_Type.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/Fl_Box.H
-Fl_Function_Type.o: ../FL/fl_ask.H
+Fl_Function_Type.o: ../FL/Fl_Double_Window.H ../FL/fl_ask.H
 Fl_Menu_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Menu_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H
 Fl_Menu_Type.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H
@@ -70,7 +70,26 @@ Fl_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H
 Fl_Type.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H
 Fl_Type.o: ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H
 Fl_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
-Fl_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H ../FL/Fl_Pixmap.H lock.xpm
+Fl_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H ../FL/Fl_Pixmap.H
+Fl_Type.o: pixmaps/lock.xpm pixmaps/flWindow.xpm pixmaps/flButton.xpm
+Fl_Type.o: pixmaps/flCheckButton.xpm pixmaps/flRoundButton.xpm
+Fl_Type.o: pixmaps/flBox.xpm pixmaps/flGroup.xpm pixmaps/flFunction.xpm
+Fl_Type.o: pixmaps/flCode.xpm pixmaps/flCodeBlock.xpm
+Fl_Type.o: pixmaps/flDeclaration.xpm pixmaps/flDeclarationBlock.xpm
+Fl_Type.o: pixmaps/flClass.xpm pixmaps/flTabs.xpm pixmaps/flInput.xpm
+Fl_Type.o: pixmaps/flChoice.xpm pixmaps/flMenuitem.xpm pixmaps/flMenubar.xpm
+Fl_Type.o: pixmaps/flSubmenu.xpm pixmaps/flScroll.xpm pixmaps/flTile.xpm
+Fl_Type.o: pixmaps/flWizard.xpm pixmaps/flPack.xpm pixmaps/flReturnButton.xpm
+Fl_Type.o: pixmaps/flLightButton.xpm pixmaps/flRepeatButton.xpm
+Fl_Type.o: pixmaps/flMenuButton.xpm pixmaps/flOutput.xpm
+Fl_Type.o: pixmaps/flTextDisplay.xpm pixmaps/flTextEdit.xpm
+Fl_Type.o: pixmaps/flFileInput.xpm pixmaps/flBrowser.xpm
+Fl_Type.o: pixmaps/flCheckBrowser.xpm pixmaps/flFileBrowser.xpm
+Fl_Type.o: pixmaps/flClock.xpm pixmaps/flHelp.xpm pixmaps/flProgress.xpm
+Fl_Type.o: pixmaps/flSlider.xpm pixmaps/flScrollBar.xpm
+Fl_Type.o: pixmaps/flValueSlider.xpm pixmaps/flAdjuster.xpm
+Fl_Type.o: pixmaps/flCounter.xpm pixmaps/flDial.xpm pixmaps/flRoller.xpm
+Fl_Type.o: pixmaps/flValueInput.xpm pixmaps/flValueOutput.xpm
 Fl_Window_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Window_Type.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H
 Fl_Window_Type.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/fl_message.H
@@ -124,9 +143,9 @@ code.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
 code.o: ../FL/Fl_Valuator.H ../FL/filename.H
 factory.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Group.H
 factory.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H ../FL/x.H
-factory.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../src/flstring.h
-factory.o: ../FL/Fl_Export.H ../config.h Fl_Widget_Type.h Fl_Type.h
-factory.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H
+factory.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Pixmap.H
+factory.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h Fl_Widget_Type.h
+factory.o: Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H
 factory.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H
 factory.o: ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H
 factory.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H
@@ -146,6 +165,7 @@ factory.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Progress.H ../FL/Fl_Adjuster.H
 factory.o: ../FL/Fl_Dial.H ../FL/Fl_Roller.H ../FL/Fl_Scrollbar.H
 factory.o: ../FL/Fl_Output.H ../FL/Fl_Input.H ../FL/Fl_Value_Input.H
 factory.o: ../FL/Fl_Value_Output.H ../FL/Fl_Value_Slider.H
+factory.o: ../FL/Fl_Multi_Label.H
 file.o: ../src/flstring.h ../FL/Fl_Export.H ../config.h alignment_panel.h
 file.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 file.o: ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H
@@ -176,10 +196,10 @@ fluid.o: ../FL/Fl_File_Input.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
 fluid.o: ../FL/fl_message.H ../FL/fl_ask.H ../FL/filename.H ../src/flstring.h
 fluid.o: ../FL/Fl_Export.H ../config.h alignment_panel.h ../FL/Fl_Tooltip.H
 fluid.o: ../FL/Fl_Widget.H ../FL/Fl_Tabs.H ../FL/Fl_Light_Button.H
-fluid.o: ../FL/Fl_Browser.H about_panel.h Fl_Type.h ../FL/Fl_Menu.H
-fluid.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H ../FL/x.H
-fluid.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Pack.H
-fluid.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H
+fluid.o: ../FL/Fl_Browser.H function_panel.h about_panel.h Fl_Type.h
+fluid.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H
+fluid.o: ../FL/Fl_Image.H ../FL/x.H Fluid_Image.h ../FL/Fl_Shared_Image.H
+fluid.o: ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H
 align_widget.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 align_widget.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H
 align_widget.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H
@@ -214,3 +234,10 @@ function_panel.o: function_panel.h ../FL/Fl.H ../FL/Enumerations.H
 function_panel.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Light_Button.H
 function_panel.o: ../FL/Fl_Button.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 function_panel.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/Fl_Box.H
+function_panel.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
+function_panel.o: ../FL/Fl_Group.H ../FL/Fl_Pixmap.H ../FL/Fl_Image.H
+function_panel.o: ../FL/x.H Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H
+function_panel.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H Fluid_Image.h
+function_panel.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Tabs.H ../FL/Fl_Pack.H
+function_panel.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
+function_panel.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
diff --git a/fluid/flAdjuster.xpm b/fluid/pixmaps/flAdjuster.xpm
similarity index 100%
rename from fluid/flAdjuster.xpm
rename to fluid/pixmaps/flAdjuster.xpm
diff --git a/fluid/flBox.xpm b/fluid/pixmaps/flBox.xpm
similarity index 100%
rename from fluid/flBox.xpm
rename to fluid/pixmaps/flBox.xpm
diff --git a/fluid/flBrowser.xpm b/fluid/pixmaps/flBrowser.xpm
similarity index 100%
rename from fluid/flBrowser.xpm
rename to fluid/pixmaps/flBrowser.xpm
diff --git a/fluid/flButton.xpm b/fluid/pixmaps/flButton.xpm
similarity index 100%
rename from fluid/flButton.xpm
rename to fluid/pixmaps/flButton.xpm
diff --git a/fluid/flCheckBrowser.xpm b/fluid/pixmaps/flCheckBrowser.xpm
similarity index 100%
rename from fluid/flCheckBrowser.xpm
rename to fluid/pixmaps/flCheckBrowser.xpm
diff --git a/fluid/flCheckButton.xpm b/fluid/pixmaps/flCheckButton.xpm
similarity index 100%
rename from fluid/flCheckButton.xpm
rename to fluid/pixmaps/flCheckButton.xpm
diff --git a/fluid/flChoice.xpm b/fluid/pixmaps/flChoice.xpm
similarity index 100%
rename from fluid/flChoice.xpm
rename to fluid/pixmaps/flChoice.xpm
diff --git a/fluid/flClass.xpm b/fluid/pixmaps/flClass.xpm
similarity index 100%
rename from fluid/flClass.xpm
rename to fluid/pixmaps/flClass.xpm
diff --git a/fluid/flClock.xpm b/fluid/pixmaps/flClock.xpm
similarity index 100%
rename from fluid/flClock.xpm
rename to fluid/pixmaps/flClock.xpm
diff --git a/fluid/flCode.xpm b/fluid/pixmaps/flCode.xpm
similarity index 100%
rename from fluid/flCode.xpm
rename to fluid/pixmaps/flCode.xpm
diff --git a/fluid/flCodeBlock.xpm b/fluid/pixmaps/flCodeBlock.xpm
similarity index 100%
rename from fluid/flCodeBlock.xpm
rename to fluid/pixmaps/flCodeBlock.xpm
diff --git a/fluid/flCounter.xpm b/fluid/pixmaps/flCounter.xpm
similarity index 100%
rename from fluid/flCounter.xpm
rename to fluid/pixmaps/flCounter.xpm
diff --git a/fluid/flDeclaration.xpm b/fluid/pixmaps/flDeclaration.xpm
similarity index 100%
rename from fluid/flDeclaration.xpm
rename to fluid/pixmaps/flDeclaration.xpm
diff --git a/fluid/flDeclarationBlock.xpm b/fluid/pixmaps/flDeclarationBlock.xpm
similarity index 100%
rename from fluid/flDeclarationBlock.xpm
rename to fluid/pixmaps/flDeclarationBlock.xpm
diff --git a/fluid/flDial.xpm b/fluid/pixmaps/flDial.xpm
similarity index 100%
rename from fluid/flDial.xpm
rename to fluid/pixmaps/flDial.xpm
diff --git a/fluid/flFileBrowser.xpm b/fluid/pixmaps/flFileBrowser.xpm
similarity index 100%
rename from fluid/flFileBrowser.xpm
rename to fluid/pixmaps/flFileBrowser.xpm
diff --git a/fluid/flFileInput.xpm b/fluid/pixmaps/flFileInput.xpm
similarity index 100%
rename from fluid/flFileInput.xpm
rename to fluid/pixmaps/flFileInput.xpm
diff --git a/fluid/flFunction.xpm b/fluid/pixmaps/flFunction.xpm
similarity index 100%
rename from fluid/flFunction.xpm
rename to fluid/pixmaps/flFunction.xpm
diff --git a/fluid/flGroup.xpm b/fluid/pixmaps/flGroup.xpm
similarity index 100%
rename from fluid/flGroup.xpm
rename to fluid/pixmaps/flGroup.xpm
diff --git a/fluid/flHelp.xpm b/fluid/pixmaps/flHelp.xpm
similarity index 100%
rename from fluid/flHelp.xpm
rename to fluid/pixmaps/flHelp.xpm
diff --git a/fluid/flInput.xpm b/fluid/pixmaps/flInput.xpm
similarity index 100%
rename from fluid/flInput.xpm
rename to fluid/pixmaps/flInput.xpm
diff --git a/fluid/flLightButton.xpm b/fluid/pixmaps/flLightButton.xpm
similarity index 100%
rename from fluid/flLightButton.xpm
rename to fluid/pixmaps/flLightButton.xpm
diff --git a/fluid/flMenuButton.xpm b/fluid/pixmaps/flMenuButton.xpm
similarity index 100%
rename from fluid/flMenuButton.xpm
rename to fluid/pixmaps/flMenuButton.xpm
diff --git a/fluid/flMenubar.xpm b/fluid/pixmaps/flMenubar.xpm
similarity index 100%
rename from fluid/flMenubar.xpm
rename to fluid/pixmaps/flMenubar.xpm
diff --git a/fluid/flMenuitem.xpm b/fluid/pixmaps/flMenuitem.xpm
similarity index 100%
rename from fluid/flMenuitem.xpm
rename to fluid/pixmaps/flMenuitem.xpm
diff --git a/fluid/flOutput.xpm b/fluid/pixmaps/flOutput.xpm
similarity index 100%
rename from fluid/flOutput.xpm
rename to fluid/pixmaps/flOutput.xpm
diff --git a/fluid/flPack.xpm b/fluid/pixmaps/flPack.xpm
similarity index 100%
rename from fluid/flPack.xpm
rename to fluid/pixmaps/flPack.xpm
diff --git a/fluid/flProgress.xpm b/fluid/pixmaps/flProgress.xpm
similarity index 100%
rename from fluid/flProgress.xpm
rename to fluid/pixmaps/flProgress.xpm
diff --git a/fluid/flRepeatButton.xpm b/fluid/pixmaps/flRepeatButton.xpm
similarity index 100%
rename from fluid/flRepeatButton.xpm
rename to fluid/pixmaps/flRepeatButton.xpm
diff --git a/fluid/flReturnButton.xpm b/fluid/pixmaps/flReturnButton.xpm
similarity index 100%
rename from fluid/flReturnButton.xpm
rename to fluid/pixmaps/flReturnButton.xpm
diff --git a/fluid/flRoller.xpm b/fluid/pixmaps/flRoller.xpm
similarity index 100%
rename from fluid/flRoller.xpm
rename to fluid/pixmaps/flRoller.xpm
diff --git a/fluid/flRoundButton.xpm b/fluid/pixmaps/flRoundButton.xpm
similarity index 100%
rename from fluid/flRoundButton.xpm
rename to fluid/pixmaps/flRoundButton.xpm
diff --git a/fluid/flScroll.xpm b/fluid/pixmaps/flScroll.xpm
similarity index 100%
rename from fluid/flScroll.xpm
rename to fluid/pixmaps/flScroll.xpm
diff --git a/fluid/flScrollBar.xpm b/fluid/pixmaps/flScrollBar.xpm
similarity index 100%
rename from fluid/flScrollBar.xpm
rename to fluid/pixmaps/flScrollBar.xpm
diff --git a/fluid/flSlider.xpm b/fluid/pixmaps/flSlider.xpm
similarity index 100%
rename from fluid/flSlider.xpm
rename to fluid/pixmaps/flSlider.xpm
diff --git a/fluid/flSubmenu.xpm b/fluid/pixmaps/flSubmenu.xpm
similarity index 100%
rename from fluid/flSubmenu.xpm
rename to fluid/pixmaps/flSubmenu.xpm
diff --git a/fluid/flTabs.xpm b/fluid/pixmaps/flTabs.xpm
similarity index 100%
rename from fluid/flTabs.xpm
rename to fluid/pixmaps/flTabs.xpm
diff --git a/fluid/flTextDisplay.xpm b/fluid/pixmaps/flTextDisplay.xpm
similarity index 100%
rename from fluid/flTextDisplay.xpm
rename to fluid/pixmaps/flTextDisplay.xpm
diff --git a/fluid/flTextEdit.xpm b/fluid/pixmaps/flTextEdit.xpm
similarity index 100%
rename from fluid/flTextEdit.xpm
rename to fluid/pixmaps/flTextEdit.xpm
diff --git a/fluid/flTile.xpm b/fluid/pixmaps/flTile.xpm
similarity index 100%
rename from fluid/flTile.xpm
rename to fluid/pixmaps/flTile.xpm
diff --git a/fluid/flValueInput.xpm b/fluid/pixmaps/flValueInput.xpm
similarity index 100%
rename from fluid/flValueInput.xpm
rename to fluid/pixmaps/flValueInput.xpm
diff --git a/fluid/flValueOutput.xpm b/fluid/pixmaps/flValueOutput.xpm
similarity index 100%
rename from fluid/flValueOutput.xpm
rename to fluid/pixmaps/flValueOutput.xpm
diff --git a/fluid/flValueSlider.xpm b/fluid/pixmaps/flValueSlider.xpm
similarity index 100%
rename from fluid/flValueSlider.xpm
rename to fluid/pixmaps/flValueSlider.xpm
diff --git a/fluid/flWindow.xpm b/fluid/pixmaps/flWindow.xpm
similarity index 100%
rename from fluid/flWindow.xpm
rename to fluid/pixmaps/flWindow.xpm
diff --git a/fluid/flWizard.xpm b/fluid/pixmaps/flWizard.xpm
similarity index 100%
rename from fluid/flWizard.xpm
rename to fluid/pixmaps/flWizard.xpm
diff --git a/fluid/lock.xpm b/fluid/pixmaps/lock.xpm
similarity index 100%
rename from fluid/lock.xpm
rename to fluid/pixmaps/lock.xpm