diff --git a/ChangeLog b/ChangeLog
index 65b898062e..55af63d138 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2008-03-24  Michael Natterer  <mitch@gimp.org>
+
+	Renamed folders in plug-ins/. Unfortunately it's impossible to
+	rename the files inside at the same time, so this is just
+	part one...
+
+	* plug-ins/FractalExplorer -> fractal-explorer
+	* plug-ins/Lighting -> lighting
+	* plug-ins/MapObject -> map-object
+	* plug-ins/gflare -> gradient-flare
+	* plug-ins/gfli -> fli
+	* plug-ins/helpbrowser -> help-browser
+	* plug-ins/ifscompose -> ifs-compose
+	* plug-ins/rcm -> colormap-rotate
+	* plug-ins/sel2path -> selection-to-path
+	* plug-ins/winicon -> win-icon
+	* plug-ins/winsnap -> win-snap
+
+	* configure.in
+	* plug-ins/Makefile.am: changed accordingly.
+
 2008-03-24  Michael Natterer  <mitch@gimp.org>
 
 	Renamed tons of plug-ins to make more sense and to be consistent:
diff --git a/configure.in b/configure.in
index f19f60bf43..638f7a182c 100644
--- a/configure.in
+++ b/configure.in
@@ -1208,7 +1208,7 @@ else
   have_gtkhtml2="no (GtkHtml2 support disabled)"
 fi
 
-AM_CONDITIONAL(BUILD_HELPBROWSER, test "x$have_gtkhtml2" = xyes)
+AM_CONDITIONAL(BUILD_HELP_BROWSER, test "x$have_gtkhtml2" = xyes)
 
 
 ###################
@@ -1959,39 +1959,34 @@ app/vectors/Makefile
 app/widgets/Makefile
 app/xcf/Makefile
 plug-ins/Makefile
-plug-ins/script-fu/Makefile
-plug-ins/script-fu/ftx/Makefile
-plug-ins/script-fu/re/Makefile
-plug-ins/script-fu/tinyscheme/Makefile
-plug-ins/script-fu/scripts/Makefile
-plug-ins/script-fu/scripts/images/Makefile
-plug-ins/xjt/Makefile
-plug-ins/FractalExplorer/Makefile
-plug-ins/FractalExplorer/examples/Makefile
-plug-ins/Lighting/Makefile
-plug-ins/Lighting/images/Makefile
-plug-ins/MapObject/Makefile
 plug-ins/bmp/Makefile
+plug-ins/colormap-rotate/Makefile
+plug-ins/colormap-rotate/images/Makefile
 plug-ins/common/Makefile
 plug-ins/faxg3/Makefile
 plug-ins/fits/Makefile
 plug-ins/flame/Makefile
+plug-ins/fli/Makefile
+plug-ins/fractal-explorer/Makefile
+plug-ins/fractal-explorer/examples/Makefile
 plug-ins/gfig/Makefile
 plug-ins/gfig/gfig-examples/Makefile
 plug-ins/gfig/images/Makefile
-plug-ins/gflare/Makefile
-plug-ins/gflare/gflares/Makefile
-plug-ins/gfli/Makefile
-plug-ins/gimpressionist/Makefile
+plug-ins/gradient-flare/Makefile
+plug-ins/gradient-flare/gflares/Makefile
 plug-ins/gimpressionist/Brushes/Makefile
+plug-ins/gimpressionist/Makefile
 plug-ins/gimpressionist/Paper/Makefile
 plug-ins/gimpressionist/Presets/Makefile
+plug-ins/help-browser/Makefile
 plug-ins/help/Makefile
-plug-ins/helpbrowser/Makefile
-plug-ins/ifscompose/Makefile
+plug-ins/ifs-compose/Makefile
 plug-ins/imagemap/Makefile
 plug-ins/imagemap/images/Makefile
 plug-ins/jpeg/Makefile
+plug-ins/lighting/Makefile
+plug-ins/lighting/images/Makefile
+plug-ins/map-object/Makefile
 plug-ins/maze/Makefile
 plug-ins/metadata/Makefile
 plug-ins/pagecurl/Makefile
@@ -1999,14 +1994,19 @@ plug-ins/print/Makefile
 plug-ins/psd/Makefile
 plug-ins/pygimp/Makefile
 plug-ins/pygimp/plug-ins/Makefile
-plug-ins/rcm/Makefile
-plug-ins/rcm/images/Makefile
-plug-ins/sel2path/Makefile
+plug-ins/script-fu/Makefile
+plug-ins/script-fu/ftx/Makefile
+plug-ins/script-fu/re/Makefile
+plug-ins/script-fu/scripts/Makefile
+plug-ins/script-fu/scripts/images/Makefile
+plug-ins/script-fu/tinyscheme/Makefile
+plug-ins/selection-to-path/Makefile
 plug-ins/sgi/Makefile
 plug-ins/twain/Makefile
 plug-ins/uri/Makefile
-plug-ins/winicon/Makefile
-plug-ins/winsnap/Makefile
+plug-ins/win-icon/Makefile
+plug-ins/win-snap/Makefile
+plug-ins/xjt/Makefile
 modules/Makefile
 devel-docs/Makefile
 devel-docs/app/Makefile
diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am
index 4e0c7506f9..ab5def323f 100644
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@ -4,8 +4,8 @@ EXTRA_DIST = \
 	makefile.msc
 
 
-if BUILD_HELPBROWSER
-helpbrowser = helpbrowser
+if BUILD_HELP_BROWSER
+help_browser = help-browser
 endif
 
 if BUILD_JPEG
@@ -29,12 +29,12 @@ twain = twain
 endif
 
 if HAVE_PNG
-winicon = winicon
+win_icon = win-icon
 endif
 
 if OS_WIN32
 twain = twain
-winsnap = winsnap
+win_snap = win-snap
 if HAVE_LIBCURL
 uri = uri
 endif
@@ -49,34 +49,34 @@ endif
 
 SUBDIRS = \
 	$(script_fu)		\
-	FractalExplorer		\
-	Lighting		\
-	MapObject		\
+	$(pygimp)		\
 	bmp			\
+	colormap-rotate		\
 	faxg3			\
 	fits			\
 	flame			\
+	fli			\
+	fractal-explorer	\
 	gfig			\
-	gflare			\
-	gfli			\
 	gimpressionist		\
+	gradient-flare		\
 	help			\
-	$(helpbrowser)		\
-	ifscompose		\
+	$(help_browser)		\
+	ifs-compose		\
 	imagemap		\
 	$(jpeg)                 \
+	lighting		\
+	map-object		\
 	maze			\
 	metadata		\
 	pagecurl		\
 	$(print)		\
-	$(pygimp)		\
 	psd			\
-	rcm			\
+	selection-to-path	\
 	sgi			\
-	sel2path		\
 	$(twain)		\
 	$(uri)			\
-	$(winicon)		\
-	$(winsnap)		\
+	$(win_icon)		\
+	$(win_snap)		\
 	$(xjt)			\
 	common
diff --git a/plug-ins/rcm/Makefile.am b/plug-ins/colormap-rotate/Makefile.am
similarity index 100%
rename from plug-ins/rcm/Makefile.am
rename to plug-ins/colormap-rotate/Makefile.am
diff --git a/plug-ins/rcm/images/Makefile.am b/plug-ins/colormap-rotate/images/Makefile.am
similarity index 100%
rename from plug-ins/rcm/images/Makefile.am
rename to plug-ins/colormap-rotate/images/Makefile.am
diff --git a/plug-ins/rcm/images/rcm-360.png b/plug-ins/colormap-rotate/images/rcm-360.png
similarity index 100%
rename from plug-ins/rcm/images/rcm-360.png
rename to plug-ins/colormap-rotate/images/rcm-360.png
diff --git a/plug-ins/rcm/images/rcm-a-b.png b/plug-ins/colormap-rotate/images/rcm-a-b.png
similarity index 100%
rename from plug-ins/rcm/images/rcm-a-b.png
rename to plug-ins/colormap-rotate/images/rcm-a-b.png
diff --git a/plug-ins/rcm/images/rcm-ccw.png b/plug-ins/colormap-rotate/images/rcm-ccw.png
similarity index 100%
rename from plug-ins/rcm/images/rcm-ccw.png
rename to plug-ins/colormap-rotate/images/rcm-ccw.png
diff --git a/plug-ins/rcm/images/rcm-cw.png b/plug-ins/colormap-rotate/images/rcm-cw.png
similarity index 100%
rename from plug-ins/rcm/images/rcm-cw.png
rename to plug-ins/colormap-rotate/images/rcm-cw.png
diff --git a/plug-ins/rcm/rcm.c b/plug-ins/colormap-rotate/rcm.c
similarity index 100%
rename from plug-ins/rcm/rcm.c
rename to plug-ins/colormap-rotate/rcm.c
diff --git a/plug-ins/rcm/rcm.h b/plug-ins/colormap-rotate/rcm.h
similarity index 100%
rename from plug-ins/rcm/rcm.h
rename to plug-ins/colormap-rotate/rcm.h
diff --git a/plug-ins/rcm/rcm_callback.c b/plug-ins/colormap-rotate/rcm_callback.c
similarity index 100%
rename from plug-ins/rcm/rcm_callback.c
rename to plug-ins/colormap-rotate/rcm_callback.c
diff --git a/plug-ins/rcm/rcm_callback.h b/plug-ins/colormap-rotate/rcm_callback.h
similarity index 100%
rename from plug-ins/rcm/rcm_callback.h
rename to plug-ins/colormap-rotate/rcm_callback.h
diff --git a/plug-ins/rcm/rcm_dialog.c b/plug-ins/colormap-rotate/rcm_dialog.c
similarity index 100%
rename from plug-ins/rcm/rcm_dialog.c
rename to plug-ins/colormap-rotate/rcm_dialog.c
diff --git a/plug-ins/rcm/rcm_dialog.h b/plug-ins/colormap-rotate/rcm_dialog.h
similarity index 100%
rename from plug-ins/rcm/rcm_dialog.h
rename to plug-ins/colormap-rotate/rcm_dialog.h
diff --git a/plug-ins/rcm/rcm_gdk.c b/plug-ins/colormap-rotate/rcm_gdk.c
similarity index 100%
rename from plug-ins/rcm/rcm_gdk.c
rename to plug-ins/colormap-rotate/rcm_gdk.c
diff --git a/plug-ins/rcm/rcm_gdk.h b/plug-ins/colormap-rotate/rcm_gdk.h
similarity index 100%
rename from plug-ins/rcm/rcm_gdk.h
rename to plug-ins/colormap-rotate/rcm_gdk.h
diff --git a/plug-ins/rcm/rcm_misc.c b/plug-ins/colormap-rotate/rcm_misc.c
similarity index 100%
rename from plug-ins/rcm/rcm_misc.c
rename to plug-ins/colormap-rotate/rcm_misc.c
diff --git a/plug-ins/rcm/rcm_misc.h b/plug-ins/colormap-rotate/rcm_misc.h
similarity index 100%
rename from plug-ins/rcm/rcm_misc.h
rename to plug-ins/colormap-rotate/rcm_misc.h
diff --git a/plug-ins/rcm/rcm_stock.c b/plug-ins/colormap-rotate/rcm_stock.c
similarity index 100%
rename from plug-ins/rcm/rcm_stock.c
rename to plug-ins/colormap-rotate/rcm_stock.c
diff --git a/plug-ins/rcm/rcm_stock.h b/plug-ins/colormap-rotate/rcm_stock.h
similarity index 100%
rename from plug-ins/rcm/rcm_stock.h
rename to plug-ins/colormap-rotate/rcm_stock.h
diff --git a/plug-ins/gfli/Makefile.am b/plug-ins/fli/Makefile.am
similarity index 100%
rename from plug-ins/gfli/Makefile.am
rename to plug-ins/fli/Makefile.am
diff --git a/plug-ins/gfli/fli.c b/plug-ins/fli/fli.c
similarity index 100%
rename from plug-ins/gfli/fli.c
rename to plug-ins/fli/fli.c
diff --git a/plug-ins/gfli/fli.h b/plug-ins/fli/fli.h
similarity index 100%
rename from plug-ins/gfli/fli.h
rename to plug-ins/fli/fli.h
diff --git a/plug-ins/gfli/gfli.c b/plug-ins/fli/gfli.c
similarity index 100%
rename from plug-ins/gfli/gfli.c
rename to plug-ins/fli/gfli.c
diff --git a/plug-ins/FractalExplorer/Dialogs.c b/plug-ins/fractal-explorer/Dialogs.c
similarity index 100%
rename from plug-ins/FractalExplorer/Dialogs.c
rename to plug-ins/fractal-explorer/Dialogs.c
diff --git a/plug-ins/FractalExplorer/Dialogs.h b/plug-ins/fractal-explorer/Dialogs.h
similarity index 100%
rename from plug-ins/FractalExplorer/Dialogs.h
rename to plug-ins/fractal-explorer/Dialogs.h
diff --git a/plug-ins/FractalExplorer/FractalExplorer.c b/plug-ins/fractal-explorer/FractalExplorer.c
similarity index 100%
rename from plug-ins/FractalExplorer/FractalExplorer.c
rename to plug-ins/fractal-explorer/FractalExplorer.c
diff --git a/plug-ins/FractalExplorer/FractalExplorer.h b/plug-ins/fractal-explorer/FractalExplorer.h
similarity index 100%
rename from plug-ins/FractalExplorer/FractalExplorer.h
rename to plug-ins/fractal-explorer/FractalExplorer.h
diff --git a/plug-ins/FractalExplorer/Makefile.am b/plug-ins/fractal-explorer/Makefile.am
similarity index 100%
rename from plug-ins/FractalExplorer/Makefile.am
rename to plug-ins/fractal-explorer/Makefile.am
diff --git a/plug-ins/FractalExplorer/examples/Asteroid_Field b/plug-ins/fractal-explorer/examples/Asteroid_Field
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Asteroid_Field
rename to plug-ins/fractal-explorer/examples/Asteroid_Field
diff --git a/plug-ins/FractalExplorer/examples/Bar_Code_Label b/plug-ins/fractal-explorer/examples/Bar_Code_Label
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Bar_Code_Label
rename to plug-ins/fractal-explorer/examples/Bar_Code_Label
diff --git a/plug-ins/FractalExplorer/examples/Beauty_of_Nature b/plug-ins/fractal-explorer/examples/Beauty_of_Nature
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Beauty_of_Nature
rename to plug-ins/fractal-explorer/examples/Beauty_of_Nature
diff --git a/plug-ins/FractalExplorer/examples/Blue_Curtain b/plug-ins/fractal-explorer/examples/Blue_Curtain
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Blue_Curtain
rename to plug-ins/fractal-explorer/examples/Blue_Curtain
diff --git a/plug-ins/FractalExplorer/examples/Car_Track b/plug-ins/fractal-explorer/examples/Car_Track
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Car_Track
rename to plug-ins/fractal-explorer/examples/Car_Track
diff --git a/plug-ins/FractalExplorer/examples/Energetic_Diamond b/plug-ins/fractal-explorer/examples/Energetic_Diamond
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Energetic_Diamond
rename to plug-ins/fractal-explorer/examples/Energetic_Diamond
diff --git a/plug-ins/FractalExplorer/examples/Explosive b/plug-ins/fractal-explorer/examples/Explosive
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Explosive
rename to plug-ins/fractal-explorer/examples/Explosive
diff --git a/plug-ins/FractalExplorer/examples/Flower b/plug-ins/fractal-explorer/examples/Flower
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Flower
rename to plug-ins/fractal-explorer/examples/Flower
diff --git a/plug-ins/FractalExplorer/examples/Fragments b/plug-ins/fractal-explorer/examples/Fragments
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Fragments
rename to plug-ins/fractal-explorer/examples/Fragments
diff --git a/plug-ins/FractalExplorer/examples/Hemp b/plug-ins/fractal-explorer/examples/Hemp
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Hemp
rename to plug-ins/fractal-explorer/examples/Hemp
diff --git a/plug-ins/FractalExplorer/examples/High_Voltage b/plug-ins/fractal-explorer/examples/High_Voltage
similarity index 100%
rename from plug-ins/FractalExplorer/examples/High_Voltage
rename to plug-ins/fractal-explorer/examples/High_Voltage
diff --git a/plug-ins/FractalExplorer/examples/Hoops b/plug-ins/fractal-explorer/examples/Hoops
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Hoops
rename to plug-ins/fractal-explorer/examples/Hoops
diff --git a/plug-ins/FractalExplorer/examples/Ice_Crystal b/plug-ins/fractal-explorer/examples/Ice_Crystal
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Ice_Crystal
rename to plug-ins/fractal-explorer/examples/Ice_Crystal
diff --git a/plug-ins/FractalExplorer/examples/Leaves b/plug-ins/fractal-explorer/examples/Leaves
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Leaves
rename to plug-ins/fractal-explorer/examples/Leaves
diff --git a/plug-ins/FractalExplorer/examples/Lightning b/plug-ins/fractal-explorer/examples/Lightning
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Lightning
rename to plug-ins/fractal-explorer/examples/Lightning
diff --git a/plug-ins/FractalExplorer/examples/Makefile.am b/plug-ins/fractal-explorer/examples/Makefile.am
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Makefile.am
rename to plug-ins/fractal-explorer/examples/Makefile.am
diff --git a/plug-ins/FractalExplorer/examples/Mandelbrot b/plug-ins/fractal-explorer/examples/Mandelbrot
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Mandelbrot
rename to plug-ins/fractal-explorer/examples/Mandelbrot
diff --git a/plug-ins/FractalExplorer/examples/Marble b/plug-ins/fractal-explorer/examples/Marble
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Marble
rename to plug-ins/fractal-explorer/examples/Marble
diff --git a/plug-ins/FractalExplorer/examples/Marble2 b/plug-ins/fractal-explorer/examples/Marble2
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Marble2
rename to plug-ins/fractal-explorer/examples/Marble2
diff --git a/plug-ins/FractalExplorer/examples/Medusa b/plug-ins/fractal-explorer/examples/Medusa
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Medusa
rename to plug-ins/fractal-explorer/examples/Medusa
diff --git a/plug-ins/FractalExplorer/examples/Nautilus b/plug-ins/fractal-explorer/examples/Nautilus
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Nautilus
rename to plug-ins/fractal-explorer/examples/Nautilus
diff --git a/plug-ins/FractalExplorer/examples/Nebula b/plug-ins/fractal-explorer/examples/Nebula
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Nebula
rename to plug-ins/fractal-explorer/examples/Nebula
diff --git a/plug-ins/FractalExplorer/examples/Plant b/plug-ins/fractal-explorer/examples/Plant
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Plant
rename to plug-ins/fractal-explorer/examples/Plant
diff --git a/plug-ins/FractalExplorer/examples/Rose b/plug-ins/fractal-explorer/examples/Rose
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Rose
rename to plug-ins/fractal-explorer/examples/Rose
diff --git a/plug-ins/FractalExplorer/examples/Saturn b/plug-ins/fractal-explorer/examples/Saturn
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Saturn
rename to plug-ins/fractal-explorer/examples/Saturn
diff --git a/plug-ins/FractalExplorer/examples/Snow_Crystal b/plug-ins/fractal-explorer/examples/Snow_Crystal
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Snow_Crystal
rename to plug-ins/fractal-explorer/examples/Snow_Crystal
diff --git a/plug-ins/FractalExplorer/examples/Soma b/plug-ins/fractal-explorer/examples/Soma
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Soma
rename to plug-ins/fractal-explorer/examples/Soma
diff --git a/plug-ins/FractalExplorer/examples/Spark b/plug-ins/fractal-explorer/examples/Spark
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Spark
rename to plug-ins/fractal-explorer/examples/Spark
diff --git a/plug-ins/FractalExplorer/examples/Suns b/plug-ins/fractal-explorer/examples/Suns
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Suns
rename to plug-ins/fractal-explorer/examples/Suns
diff --git a/plug-ins/FractalExplorer/examples/Tentacles b/plug-ins/fractal-explorer/examples/Tentacles
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Tentacles
rename to plug-ins/fractal-explorer/examples/Tentacles
diff --git a/plug-ins/FractalExplorer/examples/The_Green_Place b/plug-ins/fractal-explorer/examples/The_Green_Place
similarity index 100%
rename from plug-ins/FractalExplorer/examples/The_Green_Place
rename to plug-ins/fractal-explorer/examples/The_Green_Place
diff --git a/plug-ins/FractalExplorer/examples/Wave b/plug-ins/fractal-explorer/examples/Wave
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Wave
rename to plug-ins/fractal-explorer/examples/Wave
diff --git a/plug-ins/FractalExplorer/examples/Wood b/plug-ins/fractal-explorer/examples/Wood
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Wood
rename to plug-ins/fractal-explorer/examples/Wood
diff --git a/plug-ins/FractalExplorer/examples/Zooming_Circle b/plug-ins/fractal-explorer/examples/Zooming_Circle
similarity index 100%
rename from plug-ins/FractalExplorer/examples/Zooming_Circle
rename to plug-ins/fractal-explorer/examples/Zooming_Circle
diff --git a/plug-ins/gflare/Makefile.am b/plug-ins/gradient-flare/Makefile.am
similarity index 100%
rename from plug-ins/gflare/Makefile.am
rename to plug-ins/gradient-flare/Makefile.am
diff --git a/plug-ins/gflare/README b/plug-ins/gradient-flare/README
similarity index 100%
rename from plug-ins/gflare/README
rename to plug-ins/gradient-flare/README
diff --git a/plug-ins/gflare/gflare.c b/plug-ins/gradient-flare/gflare.c
similarity index 100%
rename from plug-ins/gflare/gflare.c
rename to plug-ins/gradient-flare/gflare.c
diff --git a/plug-ins/gflare/gflares/Bright_Star b/plug-ins/gradient-flare/gflares/Bright_Star
similarity index 100%
rename from plug-ins/gflare/gflares/Bright_Star
rename to plug-ins/gradient-flare/gflares/Bright_Star
diff --git a/plug-ins/gflare/gflares/Classic b/plug-ins/gradient-flare/gflares/Classic
similarity index 100%
rename from plug-ins/gflare/gflares/Classic
rename to plug-ins/gradient-flare/gflares/Classic
diff --git a/plug-ins/gflare/gflares/Default b/plug-ins/gradient-flare/gflares/Default
similarity index 100%
rename from plug-ins/gflare/gflares/Default
rename to plug-ins/gradient-flare/gflares/Default
diff --git a/plug-ins/gflare/gflares/Distant_Sun b/plug-ins/gradient-flare/gflares/Distant_Sun
similarity index 100%
rename from plug-ins/gflare/gflares/Distant_Sun
rename to plug-ins/gradient-flare/gflares/Distant_Sun
diff --git a/plug-ins/gflare/gflares/GFlare_101 b/plug-ins/gradient-flare/gflares/GFlare_101
similarity index 100%
rename from plug-ins/gflare/gflares/GFlare_101
rename to plug-ins/gradient-flare/gflares/GFlare_101
diff --git a/plug-ins/gflare/gflares/GFlare_102 b/plug-ins/gradient-flare/gflares/GFlare_102
similarity index 100%
rename from plug-ins/gflare/gflares/GFlare_102
rename to plug-ins/gradient-flare/gflares/GFlare_102
diff --git a/plug-ins/gflare/gflares/Hidden_Planet b/plug-ins/gradient-flare/gflares/Hidden_Planet
similarity index 100%
rename from plug-ins/gflare/gflares/Hidden_Planet
rename to plug-ins/gradient-flare/gflares/Hidden_Planet
diff --git a/plug-ins/gflare/gflares/Makefile.am b/plug-ins/gradient-flare/gflares/Makefile.am
similarity index 100%
rename from plug-ins/gflare/gflares/Makefile.am
rename to plug-ins/gradient-flare/gflares/Makefile.am
diff --git a/plug-ins/helpbrowser/Makefile.am b/plug-ins/help-browser/Makefile.am
similarity index 100%
rename from plug-ins/helpbrowser/Makefile.am
rename to plug-ins/help-browser/Makefile.am
diff --git a/plug-ins/helpbrowser/dialog.c b/plug-ins/help-browser/dialog.c
similarity index 100%
rename from plug-ins/helpbrowser/dialog.c
rename to plug-ins/help-browser/dialog.c
diff --git a/plug-ins/helpbrowser/dialog.h b/plug-ins/help-browser/dialog.h
similarity index 100%
rename from plug-ins/helpbrowser/dialog.h
rename to plug-ins/help-browser/dialog.h
diff --git a/plug-ins/helpbrowser/gimpthrobber.c b/plug-ins/help-browser/gimpthrobber.c
similarity index 100%
rename from plug-ins/helpbrowser/gimpthrobber.c
rename to plug-ins/help-browser/gimpthrobber.c
diff --git a/plug-ins/helpbrowser/gimpthrobber.h b/plug-ins/help-browser/gimpthrobber.h
similarity index 100%
rename from plug-ins/helpbrowser/gimpthrobber.h
rename to plug-ins/help-browser/gimpthrobber.h
diff --git a/plug-ins/helpbrowser/gimpthrobberaction.c b/plug-ins/help-browser/gimpthrobberaction.c
similarity index 100%
rename from plug-ins/helpbrowser/gimpthrobberaction.c
rename to plug-ins/help-browser/gimpthrobberaction.c
diff --git a/plug-ins/helpbrowser/gimpthrobberaction.h b/plug-ins/help-browser/gimpthrobberaction.h
similarity index 100%
rename from plug-ins/helpbrowser/gimpthrobberaction.h
rename to plug-ins/help-browser/gimpthrobberaction.h
diff --git a/plug-ins/helpbrowser/helpbrowser.c b/plug-ins/help-browser/helpbrowser.c
similarity index 100%
rename from plug-ins/helpbrowser/helpbrowser.c
rename to plug-ins/help-browser/helpbrowser.c
diff --git a/plug-ins/helpbrowser/queue.c b/plug-ins/help-browser/queue.c
similarity index 100%
rename from plug-ins/helpbrowser/queue.c
rename to plug-ins/help-browser/queue.c
diff --git a/plug-ins/helpbrowser/queue.h b/plug-ins/help-browser/queue.h
similarity index 100%
rename from plug-ins/helpbrowser/queue.h
rename to plug-ins/help-browser/queue.h
diff --git a/plug-ins/helpbrowser/uri.c b/plug-ins/help-browser/uri.c
similarity index 100%
rename from plug-ins/helpbrowser/uri.c
rename to plug-ins/help-browser/uri.c
diff --git a/plug-ins/helpbrowser/uri.h b/plug-ins/help-browser/uri.h
similarity index 100%
rename from plug-ins/helpbrowser/uri.h
rename to plug-ins/help-browser/uri.h
diff --git a/plug-ins/helpbrowser/wilber-reading.png b/plug-ins/help-browser/wilber-reading.png
similarity index 100%
rename from plug-ins/helpbrowser/wilber-reading.png
rename to plug-ins/help-browser/wilber-reading.png
diff --git a/plug-ins/helpbrowser/wilber-reading.svg b/plug-ins/help-browser/wilber-reading.svg
similarity index 100%
rename from plug-ins/helpbrowser/wilber-reading.svg
rename to plug-ins/help-browser/wilber-reading.svg
diff --git a/plug-ins/ifscompose/Makefile.am b/plug-ins/ifs-compose/Makefile.am
similarity index 100%
rename from plug-ins/ifscompose/Makefile.am
rename to plug-ins/ifs-compose/Makefile.am
diff --git a/plug-ins/ifscompose/README.ifscompose b/plug-ins/ifs-compose/README.ifscompose
similarity index 100%
rename from plug-ins/ifscompose/README.ifscompose
rename to plug-ins/ifs-compose/README.ifscompose
diff --git a/plug-ins/ifscompose/ifscompose.c b/plug-ins/ifs-compose/ifscompose.c
similarity index 100%
rename from plug-ins/ifscompose/ifscompose.c
rename to plug-ins/ifs-compose/ifscompose.c
diff --git a/plug-ins/ifscompose/ifscompose.h b/plug-ins/ifs-compose/ifscompose.h
similarity index 100%
rename from plug-ins/ifscompose/ifscompose.h
rename to plug-ins/ifs-compose/ifscompose.h
diff --git a/plug-ins/ifscompose/ifscompose_storage.c b/plug-ins/ifs-compose/ifscompose_storage.c
similarity index 100%
rename from plug-ins/ifscompose/ifscompose_storage.c
rename to plug-ins/ifs-compose/ifscompose_storage.c
diff --git a/plug-ins/ifscompose/ifscompose_utils.c b/plug-ins/ifs-compose/ifscompose_utils.c
similarity index 100%
rename from plug-ins/ifscompose/ifscompose_utils.c
rename to plug-ins/ifs-compose/ifscompose_utils.c
diff --git a/plug-ins/Lighting/Makefile.am b/plug-ins/lighting/Makefile.am
similarity index 100%
rename from plug-ins/Lighting/Makefile.am
rename to plug-ins/lighting/Makefile.am
diff --git a/plug-ins/Lighting/README b/plug-ins/lighting/README
similarity index 100%
rename from plug-ins/Lighting/README
rename to plug-ins/lighting/README
diff --git a/plug-ins/Lighting/TODO b/plug-ins/lighting/TODO
similarity index 100%
rename from plug-ins/Lighting/TODO
rename to plug-ins/lighting/TODO
diff --git a/plug-ins/Lighting/images/Makefile.am b/plug-ins/lighting/images/Makefile.am
similarity index 100%
rename from plug-ins/Lighting/images/Makefile.am
rename to plug-ins/lighting/images/Makefile.am
diff --git a/plug-ins/Lighting/images/stock-intensity-ambient-high.png b/plug-ins/lighting/images/stock-intensity-ambient-high.png
similarity index 100%
rename from plug-ins/Lighting/images/stock-intensity-ambient-high.png
rename to plug-ins/lighting/images/stock-intensity-ambient-high.png
diff --git a/plug-ins/Lighting/images/stock-intensity-ambient-low.png b/plug-ins/lighting/images/stock-intensity-ambient-low.png
similarity index 100%
rename from plug-ins/Lighting/images/stock-intensity-ambient-low.png
rename to plug-ins/lighting/images/stock-intensity-ambient-low.png
diff --git a/plug-ins/Lighting/images/stock-intensity-diffuse-high.png b/plug-ins/lighting/images/stock-intensity-diffuse-high.png
similarity index 100%
rename from plug-ins/Lighting/images/stock-intensity-diffuse-high.png
rename to plug-ins/lighting/images/stock-intensity-diffuse-high.png
diff --git a/plug-ins/Lighting/images/stock-intensity-diffuse-low.png b/plug-ins/lighting/images/stock-intensity-diffuse-low.png
similarity index 100%
rename from plug-ins/Lighting/images/stock-intensity-diffuse-low.png
rename to plug-ins/lighting/images/stock-intensity-diffuse-low.png
diff --git a/plug-ins/Lighting/images/stock-reflectivity-diffuse-high.png b/plug-ins/lighting/images/stock-reflectivity-diffuse-high.png
similarity index 100%
rename from plug-ins/Lighting/images/stock-reflectivity-diffuse-high.png
rename to plug-ins/lighting/images/stock-reflectivity-diffuse-high.png
diff --git a/plug-ins/Lighting/images/stock-reflectivity-diffuse-low.png b/plug-ins/lighting/images/stock-reflectivity-diffuse-low.png
similarity index 100%
rename from plug-ins/Lighting/images/stock-reflectivity-diffuse-low.png
rename to plug-ins/lighting/images/stock-reflectivity-diffuse-low.png
diff --git a/plug-ins/Lighting/images/stock-reflectivity-highlight-high.png b/plug-ins/lighting/images/stock-reflectivity-highlight-high.png
similarity index 100%
rename from plug-ins/Lighting/images/stock-reflectivity-highlight-high.png
rename to plug-ins/lighting/images/stock-reflectivity-highlight-high.png
diff --git a/plug-ins/Lighting/images/stock-reflectivity-highlight-low.png b/plug-ins/lighting/images/stock-reflectivity-highlight-low.png
similarity index 100%
rename from plug-ins/Lighting/images/stock-reflectivity-highlight-low.png
rename to plug-ins/lighting/images/stock-reflectivity-highlight-low.png
diff --git a/plug-ins/Lighting/images/stock-reflectivity-specular-high.png b/plug-ins/lighting/images/stock-reflectivity-specular-high.png
similarity index 100%
rename from plug-ins/Lighting/images/stock-reflectivity-specular-high.png
rename to plug-ins/lighting/images/stock-reflectivity-specular-high.png
diff --git a/plug-ins/Lighting/images/stock-reflectivity-specular-low.png b/plug-ins/lighting/images/stock-reflectivity-specular-low.png
similarity index 100%
rename from plug-ins/Lighting/images/stock-reflectivity-specular-low.png
rename to plug-ins/lighting/images/stock-reflectivity-specular-low.png
diff --git a/plug-ins/Lighting/lighting_apply.c b/plug-ins/lighting/lighting_apply.c
similarity index 100%
rename from plug-ins/Lighting/lighting_apply.c
rename to plug-ins/lighting/lighting_apply.c
diff --git a/plug-ins/Lighting/lighting_apply.h b/plug-ins/lighting/lighting_apply.h
similarity index 100%
rename from plug-ins/Lighting/lighting_apply.h
rename to plug-ins/lighting/lighting_apply.h
diff --git a/plug-ins/Lighting/lighting_image.c b/plug-ins/lighting/lighting_image.c
similarity index 100%
rename from plug-ins/Lighting/lighting_image.c
rename to plug-ins/lighting/lighting_image.c
diff --git a/plug-ins/Lighting/lighting_image.h b/plug-ins/lighting/lighting_image.h
similarity index 100%
rename from plug-ins/Lighting/lighting_image.h
rename to plug-ins/lighting/lighting_image.h
diff --git a/plug-ins/Lighting/lighting_main.c b/plug-ins/lighting/lighting_main.c
similarity index 100%
rename from plug-ins/Lighting/lighting_main.c
rename to plug-ins/lighting/lighting_main.c
diff --git a/plug-ins/Lighting/lighting_main.h b/plug-ins/lighting/lighting_main.h
similarity index 100%
rename from plug-ins/Lighting/lighting_main.h
rename to plug-ins/lighting/lighting_main.h
diff --git a/plug-ins/Lighting/lighting_preview.c b/plug-ins/lighting/lighting_preview.c
similarity index 100%
rename from plug-ins/Lighting/lighting_preview.c
rename to plug-ins/lighting/lighting_preview.c
diff --git a/plug-ins/Lighting/lighting_preview.h b/plug-ins/lighting/lighting_preview.h
similarity index 100%
rename from plug-ins/Lighting/lighting_preview.h
rename to plug-ins/lighting/lighting_preview.h
diff --git a/plug-ins/Lighting/lighting_shade.c b/plug-ins/lighting/lighting_shade.c
similarity index 100%
rename from plug-ins/Lighting/lighting_shade.c
rename to plug-ins/lighting/lighting_shade.c
diff --git a/plug-ins/Lighting/lighting_shade.h b/plug-ins/lighting/lighting_shade.h
similarity index 100%
rename from plug-ins/Lighting/lighting_shade.h
rename to plug-ins/lighting/lighting_shade.h
diff --git a/plug-ins/Lighting/lighting_stock.c b/plug-ins/lighting/lighting_stock.c
similarity index 100%
rename from plug-ins/Lighting/lighting_stock.c
rename to plug-ins/lighting/lighting_stock.c
diff --git a/plug-ins/Lighting/lighting_stock.h b/plug-ins/lighting/lighting_stock.h
similarity index 100%
rename from plug-ins/Lighting/lighting_stock.h
rename to plug-ins/lighting/lighting_stock.h
diff --git a/plug-ins/Lighting/lighting_ui.c b/plug-ins/lighting/lighting_ui.c
similarity index 100%
rename from plug-ins/Lighting/lighting_ui.c
rename to plug-ins/lighting/lighting_ui.c
diff --git a/plug-ins/Lighting/lighting_ui.h b/plug-ins/lighting/lighting_ui.h
similarity index 100%
rename from plug-ins/Lighting/lighting_ui.h
rename to plug-ins/lighting/lighting_ui.h
diff --git a/plug-ins/MapObject/CHANGES b/plug-ins/map-object/CHANGES
similarity index 100%
rename from plug-ins/MapObject/CHANGES
rename to plug-ins/map-object/CHANGES
diff --git a/plug-ins/MapObject/Makefile.am b/plug-ins/map-object/Makefile.am
similarity index 100%
rename from plug-ins/MapObject/Makefile.am
rename to plug-ins/map-object/Makefile.am
diff --git a/plug-ins/MapObject/README b/plug-ins/map-object/README
similarity index 100%
rename from plug-ins/MapObject/README
rename to plug-ins/map-object/README
diff --git a/plug-ins/MapObject/TODO b/plug-ins/map-object/TODO
similarity index 100%
rename from plug-ins/MapObject/TODO
rename to plug-ins/map-object/TODO
diff --git a/plug-ins/MapObject/arcball.c b/plug-ins/map-object/arcball.c
similarity index 100%
rename from plug-ins/MapObject/arcball.c
rename to plug-ins/map-object/arcball.c
diff --git a/plug-ins/MapObject/arcball.h b/plug-ins/map-object/arcball.h
similarity index 100%
rename from plug-ins/MapObject/arcball.h
rename to plug-ins/map-object/arcball.h
diff --git a/plug-ins/MapObject/mapobject_apply.c b/plug-ins/map-object/mapobject_apply.c
similarity index 100%
rename from plug-ins/MapObject/mapobject_apply.c
rename to plug-ins/map-object/mapobject_apply.c
diff --git a/plug-ins/MapObject/mapobject_apply.h b/plug-ins/map-object/mapobject_apply.h
similarity index 100%
rename from plug-ins/MapObject/mapobject_apply.h
rename to plug-ins/map-object/mapobject_apply.h
diff --git a/plug-ins/MapObject/mapobject_image.c b/plug-ins/map-object/mapobject_image.c
similarity index 100%
rename from plug-ins/MapObject/mapobject_image.c
rename to plug-ins/map-object/mapobject_image.c
diff --git a/plug-ins/MapObject/mapobject_image.h b/plug-ins/map-object/mapobject_image.h
similarity index 100%
rename from plug-ins/MapObject/mapobject_image.h
rename to plug-ins/map-object/mapobject_image.h
diff --git a/plug-ins/MapObject/mapobject_main.c b/plug-ins/map-object/mapobject_main.c
similarity index 100%
rename from plug-ins/MapObject/mapobject_main.c
rename to plug-ins/map-object/mapobject_main.c
diff --git a/plug-ins/MapObject/mapobject_main.h b/plug-ins/map-object/mapobject_main.h
similarity index 100%
rename from plug-ins/MapObject/mapobject_main.h
rename to plug-ins/map-object/mapobject_main.h
diff --git a/plug-ins/MapObject/mapobject_preview.c b/plug-ins/map-object/mapobject_preview.c
similarity index 100%
rename from plug-ins/MapObject/mapobject_preview.c
rename to plug-ins/map-object/mapobject_preview.c
diff --git a/plug-ins/MapObject/mapobject_preview.h b/plug-ins/map-object/mapobject_preview.h
similarity index 100%
rename from plug-ins/MapObject/mapobject_preview.h
rename to plug-ins/map-object/mapobject_preview.h
diff --git a/plug-ins/MapObject/mapobject_shade.c b/plug-ins/map-object/mapobject_shade.c
similarity index 100%
rename from plug-ins/MapObject/mapobject_shade.c
rename to plug-ins/map-object/mapobject_shade.c
diff --git a/plug-ins/MapObject/mapobject_shade.h b/plug-ins/map-object/mapobject_shade.h
similarity index 100%
rename from plug-ins/MapObject/mapobject_shade.h
rename to plug-ins/map-object/mapobject_shade.h
diff --git a/plug-ins/MapObject/mapobject_stock.c b/plug-ins/map-object/mapobject_stock.c
similarity index 98%
rename from plug-ins/MapObject/mapobject_stock.c
rename to plug-ins/map-object/mapobject_stock.c
index 334a794033..1c0ec1c8c5 100644
--- a/plug-ins/MapObject/mapobject_stock.c
+++ b/plug-ins/map-object/mapobject_stock.c
@@ -22,7 +22,7 @@
 
 #include "mapobject_stock.h"
 
-#include "../Lighting/images/stock-pixbufs.h"
+#include "../lighting/images/stock-pixbufs.h"
 
 
 static GtkIconFactory *mapobject_icon_factory = NULL;
diff --git a/plug-ins/MapObject/mapobject_stock.h b/plug-ins/map-object/mapobject_stock.h
similarity index 100%
rename from plug-ins/MapObject/mapobject_stock.h
rename to plug-ins/map-object/mapobject_stock.h
diff --git a/plug-ins/MapObject/mapobject_ui.c b/plug-ins/map-object/mapobject_ui.c
similarity index 100%
rename from plug-ins/MapObject/mapobject_ui.c
rename to plug-ins/map-object/mapobject_ui.c
diff --git a/plug-ins/MapObject/mapobject_ui.h b/plug-ins/map-object/mapobject_ui.h
similarity index 100%
rename from plug-ins/MapObject/mapobject_ui.h
rename to plug-ins/map-object/mapobject_ui.h
diff --git a/plug-ins/sel2path/Makefile.am b/plug-ins/selection-to-path/Makefile.am
similarity index 100%
rename from plug-ins/sel2path/Makefile.am
rename to plug-ins/selection-to-path/Makefile.am
diff --git a/plug-ins/sel2path/README b/plug-ins/selection-to-path/README
similarity index 100%
rename from plug-ins/sel2path/README
rename to plug-ins/selection-to-path/README
diff --git a/plug-ins/sel2path/README.limn b/plug-ins/selection-to-path/README.limn
similarity index 100%
rename from plug-ins/sel2path/README.limn
rename to plug-ins/selection-to-path/README.limn
diff --git a/plug-ins/sel2path/bitmap.h b/plug-ins/selection-to-path/bitmap.h
similarity index 100%
rename from plug-ins/sel2path/bitmap.h
rename to plug-ins/selection-to-path/bitmap.h
diff --git a/plug-ins/sel2path/bounding-box.h b/plug-ins/selection-to-path/bounding-box.h
similarity index 100%
rename from plug-ins/sel2path/bounding-box.h
rename to plug-ins/selection-to-path/bounding-box.h
diff --git a/plug-ins/sel2path/curve.c b/plug-ins/selection-to-path/curve.c
similarity index 100%
rename from plug-ins/sel2path/curve.c
rename to plug-ins/selection-to-path/curve.c
diff --git a/plug-ins/sel2path/curve.h b/plug-ins/selection-to-path/curve.h
similarity index 100%
rename from plug-ins/sel2path/curve.h
rename to plug-ins/selection-to-path/curve.h
diff --git a/plug-ins/sel2path/edge.c b/plug-ins/selection-to-path/edge.c
similarity index 100%
rename from plug-ins/sel2path/edge.c
rename to plug-ins/selection-to-path/edge.c
diff --git a/plug-ins/sel2path/edge.h b/plug-ins/selection-to-path/edge.h
similarity index 100%
rename from plug-ins/sel2path/edge.h
rename to plug-ins/selection-to-path/edge.h
diff --git a/plug-ins/sel2path/fit.c b/plug-ins/selection-to-path/fit.c
similarity index 100%
rename from plug-ins/sel2path/fit.c
rename to plug-ins/selection-to-path/fit.c
diff --git a/plug-ins/sel2path/fit.h b/plug-ins/selection-to-path/fit.h
similarity index 100%
rename from plug-ins/sel2path/fit.h
rename to plug-ins/selection-to-path/fit.h
diff --git a/plug-ins/sel2path/global.h b/plug-ins/selection-to-path/global.h
similarity index 100%
rename from plug-ins/sel2path/global.h
rename to plug-ins/selection-to-path/global.h
diff --git a/plug-ins/sel2path/math.c b/plug-ins/selection-to-path/math.c
similarity index 100%
rename from plug-ins/sel2path/math.c
rename to plug-ins/selection-to-path/math.c
diff --git a/plug-ins/sel2path/pxl-outline.c b/plug-ins/selection-to-path/pxl-outline.c
similarity index 100%
rename from plug-ins/sel2path/pxl-outline.c
rename to plug-ins/selection-to-path/pxl-outline.c
diff --git a/plug-ins/sel2path/pxl-outline.h b/plug-ins/selection-to-path/pxl-outline.h
similarity index 100%
rename from plug-ins/sel2path/pxl-outline.h
rename to plug-ins/selection-to-path/pxl-outline.h
diff --git a/plug-ins/sel2path/sel2path.c b/plug-ins/selection-to-path/sel2path.c
similarity index 100%
rename from plug-ins/sel2path/sel2path.c
rename to plug-ins/selection-to-path/sel2path.c
diff --git a/plug-ins/sel2path/sel2path.h b/plug-ins/selection-to-path/sel2path.h
similarity index 100%
rename from plug-ins/sel2path/sel2path.h
rename to plug-ins/selection-to-path/sel2path.h
diff --git a/plug-ins/sel2path/sel2path_adv_dialog.c b/plug-ins/selection-to-path/sel2path_adv_dialog.c
similarity index 100%
rename from plug-ins/sel2path/sel2path_adv_dialog.c
rename to plug-ins/selection-to-path/sel2path_adv_dialog.c
diff --git a/plug-ins/sel2path/spline.c b/plug-ins/selection-to-path/spline.c
similarity index 100%
rename from plug-ins/sel2path/spline.c
rename to plug-ins/selection-to-path/spline.c
diff --git a/plug-ins/sel2path/spline.h b/plug-ins/selection-to-path/spline.h
similarity index 100%
rename from plug-ins/sel2path/spline.h
rename to plug-ins/selection-to-path/spline.h
diff --git a/plug-ins/sel2path/types.h b/plug-ins/selection-to-path/types.h
similarity index 100%
rename from plug-ins/sel2path/types.h
rename to plug-ins/selection-to-path/types.h
diff --git a/plug-ins/sel2path/vector.c b/plug-ins/selection-to-path/vector.c
similarity index 100%
rename from plug-ins/sel2path/vector.c
rename to plug-ins/selection-to-path/vector.c
diff --git a/plug-ins/sel2path/vector.h b/plug-ins/selection-to-path/vector.h
similarity index 100%
rename from plug-ins/sel2path/vector.h
rename to plug-ins/selection-to-path/vector.h
diff --git a/plug-ins/winicon/Makefile.am b/plug-ins/win-icon/Makefile.am
similarity index 100%
rename from plug-ins/winicon/Makefile.am
rename to plug-ins/win-icon/Makefile.am
diff --git a/plug-ins/winicon/icodialog.c b/plug-ins/win-icon/icodialog.c
similarity index 100%
rename from plug-ins/winicon/icodialog.c
rename to plug-ins/win-icon/icodialog.c
diff --git a/plug-ins/winicon/icodialog.h b/plug-ins/win-icon/icodialog.h
similarity index 100%
rename from plug-ins/winicon/icodialog.h
rename to plug-ins/win-icon/icodialog.h
diff --git a/plug-ins/winicon/icoload.c b/plug-ins/win-icon/icoload.c
similarity index 100%
rename from plug-ins/winicon/icoload.c
rename to plug-ins/win-icon/icoload.c
diff --git a/plug-ins/winicon/icoload.h b/plug-ins/win-icon/icoload.h
similarity index 100%
rename from plug-ins/winicon/icoload.h
rename to plug-ins/win-icon/icoload.h
diff --git a/plug-ins/winicon/icosave.c b/plug-ins/win-icon/icosave.c
similarity index 100%
rename from plug-ins/winicon/icosave.c
rename to plug-ins/win-icon/icosave.c
diff --git a/plug-ins/winicon/icosave.h b/plug-ins/win-icon/icosave.h
similarity index 100%
rename from plug-ins/winicon/icosave.h
rename to plug-ins/win-icon/icosave.h
diff --git a/plug-ins/winicon/main.c b/plug-ins/win-icon/main.c
similarity index 100%
rename from plug-ins/winicon/main.c
rename to plug-ins/win-icon/main.c
diff --git a/plug-ins/winicon/main.h b/plug-ins/win-icon/main.h
similarity index 100%
rename from plug-ins/winicon/main.h
rename to plug-ins/win-icon/main.h
diff --git a/plug-ins/winsnap/Makefile.am b/plug-ins/win-snap/Makefile.am
similarity index 100%
rename from plug-ins/winsnap/Makefile.am
rename to plug-ins/win-snap/Makefile.am
diff --git a/plug-ins/winsnap/resource.h b/plug-ins/win-snap/resource.h
similarity index 100%
rename from plug-ins/winsnap/resource.h
rename to plug-ins/win-snap/resource.h
diff --git a/plug-ins/winsnap/select.cur b/plug-ins/win-snap/select.cur
similarity index 100%
rename from plug-ins/winsnap/select.cur
rename to plug-ins/win-snap/select.cur
diff --git a/plug-ins/winsnap/small.ico b/plug-ins/win-snap/small.ico
similarity index 100%
rename from plug-ins/winsnap/small.ico
rename to plug-ins/win-snap/small.ico
diff --git a/plug-ins/winsnap/winsnap.c b/plug-ins/win-snap/winsnap.c
similarity index 100%
rename from plug-ins/winsnap/winsnap.c
rename to plug-ins/win-snap/winsnap.c
diff --git a/plug-ins/winsnap/winsnap.h b/plug-ins/win-snap/winsnap.h
similarity index 100%
rename from plug-ins/winsnap/winsnap.h
rename to plug-ins/win-snap/winsnap.h
diff --git a/plug-ins/winsnap/winsnap.ico b/plug-ins/win-snap/winsnap.ico
similarity index 100%
rename from plug-ins/winsnap/winsnap.ico
rename to plug-ins/win-snap/winsnap.ico
diff --git a/plug-ins/winsnap/winsnap.rc b/plug-ins/win-snap/winsnap.rc
similarity index 100%
rename from plug-ins/winsnap/winsnap.rc
rename to plug-ins/win-snap/winsnap.rc