diff --git a/configure.in b/configure.in
index 9e3c5dfe6..80a68cbdf 100644
--- a/configure.in
+++ b/configure.in
@@ -306,6 +306,18 @@ src/modules/conf_menus/Makefile
 src/modules/conf_menus/module.desktop
 src/modules/conf_clientlist/Makefile
 src/modules/conf_clientlist/module.desktop
+src/modules/conf_dialogs/Makefile
+src/modules/conf_dialogs/module.desktop
+src/modules/conf_performance/Makefile
+src/modules/conf_performance/module.desktop
+src/modules/conf_winlist/Makefile
+src/modules/conf_winlist/module.desktop
+src/modules/conf_exebuf/Makefile
+src/modules/conf_exebuf/module.desktop
+src/modules/conf_paths/Makefile
+src/modules/conf_paths/module.desktop
+src/modules/conf_mime/Makefile
+src/modules/conf_mime/module.desktop
 src/preload/Makefile
 data/Makefile
 data/fonts/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0f9a544d1..1f6632e9a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -50,23 +50,7 @@ src/bin/e_int_border_locks.c
 src/bin/e_int_border_menu.c
 src/bin/e_int_border_prop.c
 src/bin/e_int_border_remember.c
-src/bin/e_int_config_clientlist.c
-src/bin/e_int_config_dialogs.c
-src/bin/e_int_config_exebuf.c
-src/bin/e_int_config_focus.c
-src/bin/e_int_config_keybindings.c
-src/bin/e_int_config_menus.c
-src/bin/e_int_config_mime.c
-src/bin/e_int_config_mime_edit.c
 src/bin/e_int_config_modules.c
-src/bin/e_int_config_mousebindings.c
-src/bin/e_int_config_mouse.c
-src/bin/e_int_config_paths.c
-src/bin/e_int_config_performance.c
-src/bin/e_int_config_shelf.c
-src/bin/e_int_config_window_display.c
-src/bin/e_int_config_window_manipulation.c
-src/bin/e_int_config_winlist.c
 src/bin/e_int_gadcon_config.c
 src/bin/e_intl.c
 src/bin/e_int_menus.c
@@ -149,19 +133,60 @@ src/bin/e_zone.c
 src/modules/battery/e_mod_config.c
 src/modules/battery/e_mod_main.c
 src/modules/clock/e_mod_main.c
+src/modules/conf_applications/e_int_config_apps.c
+src/modules/conf_applications/e_mod_main.c
 src/modules/conf_borders/e_int_config_borders.c
 src/modules/conf_borders/e_mod_main.c
+src/modules/conf_clientlist/e_int_config_clientlist.c
+src/modules/conf_clientlist/e_mod_main.c
 src/modules/conf_colors/e_int_config_color_classes.c
 src/modules/conf_colors/e_mod_main.c
+src/modules/conf_desk/e_int_config_desk.c
+src/modules/conf_desk/e_mod_main.c
+src/modules/conf_desklock/e_int_config_desklock.c
+src/modules/conf_desklock/e_mod_main.c
+src/modules/conf_desks/e_int_config_desks.c
+src/modules/conf_desks/e_mod_main.c
+src/modules/conf_dialogs/e_int_config_dialogs.c
+src/modules/conf_dialogs/e_mod_main.c
+src/modules/conf_display/e_int_config_display.c
+src/modules/conf_display/e_mod_main.c
+src/modules/conf_dpms/e_int_config_dpms.c
+src/modules/conf_dpms/e_mod_main.c
+src/modules/conf_exebuf/e_int_config_exebuf.c
+src/modules/conf_exebuf/e_mod_main.c
 src/modules/conf_fonts/e_int_config_fonts.c
 src/modules/conf_fonts/e_mod_main.c
 src/modules/conf_icon_theme/e_int_config_icon_themes.c
 src/modules/conf_icon_theme/e_mod_main.c
 src/modules/conf_imc/e_int_config_imc.c
 src/modules/conf_imc/e_int_config_imc_import.c
+src/modules/conf_imc/e_mod_main.c
 src/modules/conf_intl/e_int_config_intl.c
+src/modules/conf_intl/e_mod_main.c
+src/modules/conf_keybindings/e_int_config_keybindings.c
+src/modules/conf_keybindings/e_mod_main.c
+src/modules/conf_menus/e_int_config_menus.c
+src/modules/conf_menus/e_mod_main.c
+src/modules/conf_mime/e_int_config_mime.c
+src/modules/conf_mime/e_int_config_mime_edit.c
+src/modules/conf_mime/e_mod_main.c
+src/modules/conf_mousebindings/e_int_config_mousebindings.c
+src/modules/conf_mousebindings/e_mod_main.c
 src/modules/conf_mouse_cursor/e_int_config_cursor.c
 src/modules/conf_mouse_cursor/e_mod_main.c
+src/modules/conf_mouse/e_int_config_mouse.c
+src/modules/conf_mouse/e_mod_main.c
+src/modules/conf_paths/e_int_config_paths.c
+src/modules/conf_paths/e_mod_main.c
+src/modules/conf_performance/e_int_config_performance.c
+src/modules/conf_performance/e_mod_main.c
+src/modules/conf_profiles/e_int_config_profiles.c
+src/modules/conf_profiles/e_mod_main.c
+src/modules/conf_screensaver/e_int_config_screensaver.c
+src/modules/conf_screensaver/e_mod_main.c
+src/modules/conf_shelves/e_int_config_shelf.c
+src/modules/conf_shelves/e_mod_main.c
 src/modules/conf_startup/e_int_config_startup.c
 src/modules/conf_startup/e_mod_main.c
 src/modules/conf_theme/e_int_config_theme.c
@@ -173,20 +198,14 @@ src/modules/conf_wallpaper/e_int_config_wallpaper.c
 src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
 src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
 src/modules/conf_wallpaper/e_mod_main.c
-src/modules/conf_applications/e_int_config_apps.c
-src/modules/conf_applications/e_mod_main.c
-src/modules/conf_desk/e_mod_main.c
-src/modules/conf_desk/e_int_config_desk.c
-src/modules/conf_desks/e_mod_main.c
-src/modules/conf_desks/e_int_config_desks.c
-src/modules/conf_desklock/e_mod_main.c
-src/modules/conf_desklock/e_int_config_desklock.c
-src/modules/conf_display/e_mod_main.c
-src/modules/conf_display/e_int_config_display.c
-src/modules/conf_screensaver/e_mod_main.c
-src/modules/conf_screensaver/e_int_config_screensaver.c
-src/modules/conf_dpms/e_mod_main.c
-src/modules/conf_dpms/e_int_config_dpms.c
+src/modules/conf_window_display/e_int_config_window_display.c
+src/modules/conf_window_display/e_mod_main.c
+src/modules/conf_window_focus/e_int_config_focus.c
+src/modules/conf_window_focus/e_mod_main.c
+src/modules/conf_window_manipulation/e_int_config_window_manipulation.c
+src/modules/conf_window_manipulation/e_mod_main.c
+src/modules/conf_winlist/e_int_config_winlist.c
+src/modules/conf_winlist/e_mod_main.c
 src/modules/cpufreq/e_mod_main.c
 src/modules/cpufreq/freqset.c
 src/modules/dropshadow/e_mod_config.c
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 445b9e7ea..8f29ed158 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -112,12 +112,6 @@ e_widget_tlist.h \
 e_widget_config_list.h \
 e_slider.h \
 e_widget_slider.h \
-e_int_config_performance.h \
-e_int_config_winlist.h \
-e_int_config_exebuf.h \
-e_int_config_dialogs.h \
-e_int_config_mime.h \
-e_int_config_mime_edit.h \
 e_exebuf.h \
 e_desklock.h \
 e_screensaver.h \
@@ -130,7 +124,6 @@ e_stolen.h \
 e_gadcon.h \
 e_shelf.h \
 e_widget_preview.h \
-e_int_config_paths.h \
 e_int_shelf_config.h \
 e_int_gadcon_config.h \
 e_confirm_dialog.h \
@@ -247,12 +240,6 @@ e_widget_tlist.c \
 e_widget_config_list.c \
 e_slider.c \
 e_widget_slider.c \
-e_int_config_performance.c \
-e_int_config_winlist.c \
-e_int_config_exebuf.c \
-e_int_config_dialogs.c \
-e_int_config_mime.c \
-e_int_config_mime_edit.c \
 e_exebuf.c \
 e_desklock.c \
 e_screensaver.c \
@@ -265,7 +252,6 @@ e_stolen.c \
 e_gadcon.c \
 e_shelf.c \
 e_widget_preview.c \
-e_int_config_paths.c \
 e_int_shelf_config.c \
 e_int_gadcon_config.c \
 e_confirm_dialog.c \
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index b49681f52..c2a425375 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -781,6 +781,12 @@ e_config_init(void)
 	CFG_MODULE("conf_window_manipulation", 1);
 	CFG_MODULE("conf_menus", 1);
 	CFG_MODULE("conf_clientlist", 1);
+	CFG_MODULE("conf_dialogs", 1);
+	CFG_MODULE("conf_performance", 1);
+	CFG_MODULE("conf_winlist", 1);
+	CFG_MODULE("conf_exebuf", 1);
+	CFG_MODULE("conf_paths", 1);
+	CFG_MODULE("conf_mime", 1);
      }
 #if 0
      {
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index 107079566..bbb332a33 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -463,13 +463,13 @@ e_configure_init(void)
 //   e_configure_registry_item_add("menus/menu_settings", 30, _("Menu Settings"), NULL, "enlightenment/menu_settings", e_int_config_menus);
 //   e_configure_registry_item_add("menus/client_list_menu", 40, _("Client List Menu"), NULL, "enlightenment/windows", e_int_config_clientlist);
    
-   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
-   e_configure_registry_item_add("advanced/dialogs", 10, _("Dialogs"), NULL, "enlightenment/configuration", e_int_config_dialogs);
-   e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "enlightenment/performance", e_int_config_performance);   
-   e_configure_registry_item_add("advanced/window_list", 30, _("Window List"), NULL, "enlightenment/winlist", e_int_config_winlist);
-   e_configure_registry_item_add("advanced/run_command", 40, _("Run Command"), NULL, "enlightenment/run", e_int_config_exebuf);
-   e_configure_registry_item_add("advanced/search_directories", 50, _("Search Directories"), NULL, "enlightenment/directories", e_int_config_paths);
-   e_configure_registry_item_add("advanced/file_icons", 60, _("File Icons"), NULL, "enlightenment/file_icons", e_int_config_mime);
+//   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
+//   e_configure_registry_item_add("advanced/dialogs", 10, _("Dialogs"), NULL, "enlightenment/configuration", e_int_config_dialogs);
+//   e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "enlightenment/performance", e_int_config_performance);   
+//   e_configure_registry_item_add("advanced/window_list", 30, _("Window List"), NULL, "enlightenment/winlist", e_int_config_winlist);
+//   e_configure_registry_item_add("advanced/run_command", 40, _("Run Command"), NULL, "enlightenment/run", e_int_config_exebuf);
+//   e_configure_registry_item_add("advanced/search_directories", 50, _("Search Directories"), NULL, "enlightenment/directories", e_int_config_paths);
+//   e_configure_registry_item_add("advanced/file_icons", 60, _("File Icons"), NULL, "enlightenment/file_icons", e_int_config_mime);
    
    e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "enlightenment/extensions");
    e_configure_registry_item_add("extensions/modules", 10, _("Modules"), NULL, "enlightenment/modules", e_int_config_modules);
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 36fe7d986..d8eaca3cc 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -84,12 +84,6 @@
 #include "e_widget_config_list.h"
 #include "e_slider.h"
 #include "e_widget_slider.h"
-#include "e_int_config_performance.h"
-#include "e_int_config_winlist.h"
-#include "e_int_config_exebuf.h"
-#include "e_int_config_dialogs.h"
-#include "e_int_config_mime.h"
-#include "e_int_config_mime_edit.h"
 #include "e_exebuf.h"
 #include "e_desklock.h"
 #include "e_screensaver.h"
@@ -104,7 +98,6 @@
 #include "e_tlist.h"
 #include "e_widget_tlist.h"
 #include "e_widget_preview.h"
-#include "e_int_config_paths.h"
 #include "e_int_shelf_config.h"
 #include "e_int_gadcon_config.h"
 #include "e_confirm_dialog.h"
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 308e331b6..3e48d5d57 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -37,4 +37,11 @@ conf_window_display \
 conf_window_focus \
 conf_window_manipulation \
 conf_menus \
-conf_clientlist
+conf_clientlist \
+conf_dialogs \
+conf_performance \
+conf_winlist \
+conf_exebuf \
+conf_paths \
+conf_mime
+
diff --git a/src/modules/conf_dialogs/.cvsignore b/src/modules/conf_dialogs/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_dialogs/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_dialogs/Makefile.am b/src/modules/conf_dialogs/Makefile.am
new file mode 100644
index 000000000..2b09d4543
--- /dev/null
+++ b/src/modules/conf_dialogs/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_dialogs
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_dialogs.c \
+                         e_int_config_dialogs.h
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_dialogs/e-module-conf_dialogs.edj b/src/modules/conf_dialogs/e-module-conf_dialogs.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_dialogs/e-module-conf_dialogs.edj differ
diff --git a/src/bin/e_int_config_dialogs.c b/src/modules/conf_dialogs/e_int_config_dialogs.c
similarity index 100%
rename from src/bin/e_int_config_dialogs.c
rename to src/modules/conf_dialogs/e_int_config_dialogs.c
diff --git a/src/bin/e_int_config_dialogs.h b/src/modules/conf_dialogs/e_int_config_dialogs.h
similarity index 100%
rename from src/bin/e_int_config_dialogs.h
rename to src/modules/conf_dialogs/e_int_config_dialogs.h
diff --git a/src/modules/conf_dialogs/e_mod_main.c b/src/modules/conf_dialogs/e_mod_main.c
new file mode 100644
index 000000000..c747f32ff
--- /dev/null
+++ b/src/modules/conf_dialogs/e_mod_main.c
@@ -0,0 +1,64 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - Dialogs"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
+   e_configure_registry_item_add("advanced/dialogs", 10, _("Dialogs"), NULL, "enlightenment/configuration", e_int_config_dialogs);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "_config_config_dialog_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("advanced/dialogs");
+   e_configure_registry_category_del("advanced");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Dialogs"),
+			_("Configuration dialog for dialogs."));
+   return 1;
+}
diff --git a/src/modules/conf_dialogs/e_mod_main.h b/src/modules/conf_dialogs/e_mod_main.h
new file mode 100644
index 000000000..9d520356d
--- /dev/null
+++ b/src/modules/conf_dialogs/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_dialogs.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_dialogs.h"
+
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_dialogs/module.desktop.in b/src/modules/conf_dialogs/module.desktop.in
new file mode 100644
index 000000000..bcda8627c
--- /dev/null
+++ b/src/modules/conf_dialogs/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Dialogs
+Icon=e-module-conf_dialogs
diff --git a/src/modules/conf_exebuf/.cvsignore b/src/modules/conf_exebuf/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_exebuf/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_exebuf/Makefile.am b/src/modules/conf_exebuf/Makefile.am
new file mode 100644
index 000000000..ff6736876
--- /dev/null
+++ b/src/modules/conf_exebuf/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_exebuf
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_exebuf.c \
+                         e_int_config_exebuf.h                         
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_exebuf/e-module-conf_exebuf.edj b/src/modules/conf_exebuf/e-module-conf_exebuf.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_exebuf/e-module-conf_exebuf.edj differ
diff --git a/src/bin/e_int_config_exebuf.c b/src/modules/conf_exebuf/e_int_config_exebuf.c
similarity index 100%
rename from src/bin/e_int_config_exebuf.c
rename to src/modules/conf_exebuf/e_int_config_exebuf.c
diff --git a/src/bin/e_int_config_exebuf.h b/src/modules/conf_exebuf/e_int_config_exebuf.h
similarity index 100%
rename from src/bin/e_int_config_exebuf.h
rename to src/modules/conf_exebuf/e_int_config_exebuf.h
diff --git a/src/modules/conf_exebuf/e_mod_main.c b/src/modules/conf_exebuf/e_mod_main.c
new file mode 100644
index 000000000..cefa70fc7
--- /dev/null
+++ b/src/modules/conf_exebuf/e_mod_main.c
@@ -0,0 +1,64 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - Run Command"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
+   e_configure_registry_item_add("advanced/run_command", 40, _("Run Command"), NULL, "enlightenment/run", e_int_config_exebuf);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "_config_exebuf_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("advanced/run_command");
+   e_configure_registry_category_del("advanced");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Run Command"),
+			_("Configuration dialog for run command."));
+   return 1;
+}
diff --git a/src/modules/conf_exebuf/e_mod_main.h b/src/modules/conf_exebuf/e_mod_main.h
new file mode 100644
index 000000000..eb1db2012
--- /dev/null
+++ b/src/modules/conf_exebuf/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_exebuf.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_exebuf.h"
+
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_exebuf/module.desktop.in b/src/modules/conf_exebuf/module.desktop.in
new file mode 100644
index 000000000..a933fa547
--- /dev/null
+++ b/src/modules/conf_exebuf/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Run Command
+Icon=e-module-conf_exebuf
diff --git a/src/modules/conf_mime/.cvsignore b/src/modules/conf_mime/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_mime/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_mime/Makefile.am b/src/modules/conf_mime/Makefile.am
new file mode 100644
index 000000000..9b3113183
--- /dev/null
+++ b/src/modules/conf_mime/Makefile.am
@@ -0,0 +1,33 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_mime
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_mime.c \
+                         e_int_config_mime.h \                        
+                         e_int_config_mime_edit.c \
+                         e_int_config_mime_edit.h
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_mime/e-module-conf_mime.edj b/src/modules/conf_mime/e-module-conf_mime.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_mime/e-module-conf_mime.edj differ
diff --git a/src/bin/e_int_config_mime.c b/src/modules/conf_mime/e_int_config_mime.c
similarity index 100%
rename from src/bin/e_int_config_mime.c
rename to src/modules/conf_mime/e_int_config_mime.c
diff --git a/src/bin/e_int_config_mime.h b/src/modules/conf_mime/e_int_config_mime.h
similarity index 100%
rename from src/bin/e_int_config_mime.h
rename to src/modules/conf_mime/e_int_config_mime.h
diff --git a/src/bin/e_int_config_mime_edit.c b/src/modules/conf_mime/e_int_config_mime_edit.c
similarity index 100%
rename from src/bin/e_int_config_mime_edit.c
rename to src/modules/conf_mime/e_int_config_mime_edit.c
diff --git a/src/bin/e_int_config_mime_edit.h b/src/modules/conf_mime/e_int_config_mime_edit.h
similarity index 100%
rename from src/bin/e_int_config_mime_edit.h
rename to src/modules/conf_mime/e_int_config_mime_edit.h
diff --git a/src/modules/conf_mime/e_mod_main.c b/src/modules/conf_mime/e_mod_main.c
new file mode 100644
index 000000000..ed971890d
--- /dev/null
+++ b/src/modules/conf_mime/e_mod_main.c
@@ -0,0 +1,64 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - File Icons"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
+   e_configure_registry_item_add("advanced/file_icons", 60, _("File Icons"), NULL, "enlightenment/file_icons", e_int_config_mime);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "_config_mime_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("advanced/file_icons");
+   e_configure_registry_category_del("advanced");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - File Icons"),
+			_("Configuration dialog for file icons."));
+   return 1;
+}
diff --git a/src/modules/conf_mime/e_mod_main.h b/src/modules/conf_mime/e_mod_main.h
new file mode 100644
index 000000000..eb9e95463
--- /dev/null
+++ b/src/modules/conf_mime/e_mod_main.h
@@ -0,0 +1,23 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_mime_edit.h"
+#include "e_int_config_mime.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_mime_edit.h"
+#include "e_int_config_mime.h"
+
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_mime/module.desktop.in b/src/modules/conf_mime/module.desktop.in
new file mode 100644
index 000000000..a93625d29
--- /dev/null
+++ b/src/modules/conf_mime/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - File Icons
+Icon=e-module-conf_mime
diff --git a/src/modules/conf_paths/.cvsignore b/src/modules/conf_paths/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_paths/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_paths/Makefile.am b/src/modules/conf_paths/Makefile.am
new file mode 100644
index 000000000..24c1fb4ce
--- /dev/null
+++ b/src/modules/conf_paths/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_paths
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_paths.c \
+                         e_int_config_paths.h                         
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_paths/e-module-conf_paths.edj b/src/modules/conf_paths/e-module-conf_paths.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_paths/e-module-conf_paths.edj differ
diff --git a/src/bin/e_int_config_paths.c b/src/modules/conf_paths/e_int_config_paths.c
similarity index 100%
rename from src/bin/e_int_config_paths.c
rename to src/modules/conf_paths/e_int_config_paths.c
diff --git a/src/bin/e_int_config_paths.h b/src/modules/conf_paths/e_int_config_paths.h
similarity index 100%
rename from src/bin/e_int_config_paths.h
rename to src/modules/conf_paths/e_int_config_paths.h
diff --git a/src/modules/conf_paths/e_mod_main.c b/src/modules/conf_paths/e_mod_main.c
new file mode 100644
index 000000000..4954fa18d
--- /dev/null
+++ b/src/modules/conf_paths/e_mod_main.c
@@ -0,0 +1,64 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - Search Directories"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
+   e_configure_registry_item_add("advanced/search_directories", 50, _("Search Directories"), NULL, "enlightenment/directories", e_int_config_paths);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "_config_paths_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("advanced/search_directories");
+   e_configure_registry_category_del("advanced");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Search Directories"),
+			_("Configuration dialog for search directories."));
+   return 1;
+}
diff --git a/src/modules/conf_paths/e_mod_main.h b/src/modules/conf_paths/e_mod_main.h
new file mode 100644
index 000000000..89a824a33
--- /dev/null
+++ b/src/modules/conf_paths/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_paths.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_paths.h"
+
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_paths/module.desktop.in b/src/modules/conf_paths/module.desktop.in
new file mode 100644
index 000000000..377e8f3d1
--- /dev/null
+++ b/src/modules/conf_paths/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Search Directories
+Icon=e-module-conf_paths
diff --git a/src/modules/conf_performance/.cvsignore b/src/modules/conf_performance/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_performance/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_performance/Makefile.am b/src/modules/conf_performance/Makefile.am
new file mode 100644
index 000000000..d95553723
--- /dev/null
+++ b/src/modules/conf_performance/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_performance
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_performance.c \
+                         e_int_config_performance.h                         
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_performance/e-module-conf_performance.edj b/src/modules/conf_performance/e-module-conf_performance.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_performance/e-module-conf_performance.edj differ
diff --git a/src/bin/e_int_config_performance.c b/src/modules/conf_performance/e_int_config_performance.c
similarity index 100%
rename from src/bin/e_int_config_performance.c
rename to src/modules/conf_performance/e_int_config_performance.c
diff --git a/src/bin/e_int_config_performance.h b/src/modules/conf_performance/e_int_config_performance.h
similarity index 100%
rename from src/bin/e_int_config_performance.h
rename to src/modules/conf_performance/e_int_config_performance.h
diff --git a/src/modules/conf_performance/e_mod_main.c b/src/modules/conf_performance/e_mod_main.c
new file mode 100644
index 000000000..0524fca67
--- /dev/null
+++ b/src/modules/conf_performance/e_mod_main.c
@@ -0,0 +1,64 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - Performance"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
+   e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "enlightenment/performance", e_int_config_performance);   
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "_config_performance_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("advanced/performance");
+   e_configure_registry_category_del("advanced");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Performance"),
+			_("Configuration dialog for performance."));
+   return 1;
+}
diff --git a/src/modules/conf_performance/e_mod_main.h b/src/modules/conf_performance/e_mod_main.h
new file mode 100644
index 000000000..c97c1ad65
--- /dev/null
+++ b/src/modules/conf_performance/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_performance.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_performance.h"
+
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_performance/module.desktop.in b/src/modules/conf_performance/module.desktop.in
new file mode 100644
index 000000000..75533fd2b
--- /dev/null
+++ b/src/modules/conf_performance/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Performance
+Icon=e-module-conf_performance
diff --git a/src/modules/conf_winlist/.cvsignore b/src/modules/conf_winlist/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_winlist/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_winlist/Makefile.am b/src/modules/conf_winlist/Makefile.am
new file mode 100644
index 000000000..d5636c55b
--- /dev/null
+++ b/src/modules/conf_winlist/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_winlist
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h \
+			 e_int_config_winlist.c \
+                         e_int_config_winlist.h                         
+			 
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_winlist/e-module-conf_winlist.edj b/src/modules/conf_winlist/e-module-conf_winlist.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_winlist/e-module-conf_winlist.edj differ
diff --git a/src/bin/e_int_config_winlist.c b/src/modules/conf_winlist/e_int_config_winlist.c
similarity index 100%
rename from src/bin/e_int_config_winlist.c
rename to src/modules/conf_winlist/e_int_config_winlist.c
diff --git a/src/bin/e_int_config_winlist.h b/src/modules/conf_winlist/e_int_config_winlist.h
similarity index 100%
rename from src/bin/e_int_config_winlist.h
rename to src/modules/conf_winlist/e_int_config_winlist.h
diff --git a/src/modules/conf_winlist/e_mod_main.c b/src/modules/conf_winlist/e_mod_main.c
new file mode 100644
index 000000000..48362ca72
--- /dev/null
+++ b/src/modules/conf_winlist/e_mod_main.c
@@ -0,0 +1,64 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_Module *conf_module = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+   E_MODULE_API_VERSION,
+     "Configuration - Window List"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
+   e_configure_registry_item_add("advanced/window_list", 30, _("Window List"), NULL, "enlightenment/winlist", e_int_config_winlist);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "_config_winlist_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("advanced/window_list");
+   e_configure_registry_category_del("advanced");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Window List"),
+			_("Configuration dialog for window list."));
+   return 1;
+}
diff --git a/src/modules/conf_winlist/e_mod_main.h b/src/modules/conf_winlist/e_mod_main.h
new file mode 100644
index 000000000..558305d6e
--- /dev/null
+++ b/src/modules/conf_winlist/e_mod_main.h
@@ -0,0 +1,21 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_winlist.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_winlist.h"
+
+
+EAPI extern E_Module_Api e_modapi;
+
+EAPI void *e_modapi_init     (E_Module *m);
+EAPI int   e_modapi_shutdown (E_Module *m);
+EAPI int   e_modapi_save     (E_Module *m);
+EAPI int   e_modapi_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_winlist/module.desktop.in b/src/modules/conf_winlist/module.desktop.in
new file mode 100644
index 000000000..bfdecf779
--- /dev/null
+++ b/src/modules/conf_winlist/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Window List
+Icon=e-module-conf_winlist