diff --git a/configure.in b/configure.in
index 2b9f00078..efc9bbabd 100644
--- a/configure.in
+++ b/configure.in
@@ -276,6 +276,18 @@ src/modules/conf_profiles/Makefile
 src/modules/conf_profiles/module.desktop
 src/modules/conf_applications/Makefile
 src/modules/conf_applications/module.desktop
+src/modules/conf_desks/Makefile
+src/modules/conf_desks/module.desktop
+src/modules/conf_desk/Makefile
+src/modules/conf_desk/module.desktop
+src/modules/conf_display/Makefile
+src/modules/conf_display/module.desktop
+src/modules/conf_desklock/Makefile
+src/modules/conf_desklock/module.desktop
+src/modules/conf_screensaver/Makefile
+src/modules/conf_screensaver/module.desktop
+src/modules/conf_dpms/Makefile
+src/modules/conf_dpms/module.desktop
 src/preload/Makefile
 data/Makefile
 data/fonts/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d892551d6..0f9a544d1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -51,17 +51,9 @@ 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_desk.c
-src/bin/e_int_config_desklock.c
-src/bin/e_int_config_desks.c
 src/bin/e_int_config_dialogs.c
-src/bin/e_int_config_display.c
-src/bin/e_int_config_dpms.c
 src/bin/e_int_config_exebuf.c
 src/bin/e_int_config_focus.c
-src/modules/conf_imc/e_int_config_imc.c
-src/modules/conf_imc/e_int_config_imc_import.c
-src/modules/conf_intl/e_int_config_intl.c
 src/bin/e_int_config_keybindings.c
 src/bin/e_int_config_menus.c
 src/bin/e_int_config_mime.c
@@ -71,7 +63,6 @@ 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_screensaver.c
 src/bin/e_int_config_shelf.c
 src/bin/e_int_config_window_display.c
 src/bin/e_int_config_window_manipulation.c
@@ -166,6 +157,9 @@ 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_intl/e_int_config_intl.c
 src/modules/conf_mouse_cursor/e_int_config_cursor.c
 src/modules/conf_mouse_cursor/e_mod_main.c
 src/modules/conf_startup/e_int_config_startup.c
@@ -181,6 +175,18 @@ 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/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 583cecfa2..168d6b356 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -98,7 +98,6 @@ e_widget_entry.h \
 e_widget_image.h \
 e_config_dialog.h \
 e_int_config_focus.h \
-e_int_config_desks.h \
 e_configure.h \
 e_int_border_locks.h \
 e_thumb.h \
@@ -121,14 +120,10 @@ e_int_config_keybindings.h \
 e_int_config_mousebindings.h \
 e_int_config_performance.h \
 e_int_config_winlist.h \
-e_int_config_display.h \
-e_int_config_desklock.h \
 e_int_config_exebuf.h \
 e_int_config_dialogs.h \
 e_int_config_mime.h \
 e_int_config_mime_edit.h \
-e_int_config_screensaver.h \
-e_int_config_dpms.h \
 e_exebuf.h \
 e_desklock.h \
 e_screensaver.h \
@@ -166,7 +161,6 @@ e_fwin.h \
 e_widget_aspect.h \
 e_filereg.h \
 e_widget_desk_preview.h \
-e_int_config_desk.h \
 e_int_config_clientlist.h \
 e_fm_prop.h \
 e_mouse.h \
@@ -248,7 +242,6 @@ e_widget_entry.c \
 e_widget_image.c \
 e_config_dialog.c \
 e_int_config_focus.c \
-e_int_config_desks.c \
 e_configure.c \
 e_int_border_locks.c \
 e_thumb.c \
@@ -271,14 +264,10 @@ e_int_config_keybindings.c \
 e_int_config_mousebindings.c \
 e_int_config_performance.c \
 e_int_config_winlist.c \
-e_int_config_display.c \
-e_int_config_desklock.c \
 e_int_config_exebuf.c \
 e_int_config_dialogs.c \
 e_int_config_mime.c \
 e_int_config_mime_edit.c \
-e_int_config_screensaver.c \
-e_int_config_dpms.c \
 e_exebuf.c \
 e_desklock.c \
 e_screensaver.c \
@@ -316,7 +305,6 @@ e_fwin.c \
 e_widget_aspect.c \
 e_widget_desk_preview.c \
 e_filereg.c \
-e_int_config_desk.c \
 e_fm_prop.c \
 e_int_config_clientlist.c \
 e_mouse.c \
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 8adcce86a..0be66af41 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -766,6 +766,12 @@ e_config_init(void)
 	CFG_MODULE("conf_transitions", 1);
 	CFG_MODULE("conf_startup", 1);
 	CFG_MODULE("conf_applications", 1);
+	CFG_MODULE("conf_desks", 1);
+	CFG_MODULE("conf_desk", 1);
+	CFG_MODULE("conf_display", 1);
+	CFG_MODULE("conf_desklock", 1);
+	CFG_MODULE("conf_screensaver", 1);
+	CFG_MODULE("conf_dpms", 1);
      }
 #if 0
      {
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index 86415cf07..944996968 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -438,12 +438,12 @@ e_configure_init(void)
 //   e_configure_registry_item_add("applications/restart_applications", 30, _("Restart Applications"), NULL, "enlightenment/restart_applications", e_int_config_apps_restart);
 //   e_configure_registry_item_add("applications/startup_applications", 40, _("Startup Applications"), NULL, "enlightenment/startup_applications", e_int_config_apps_startup);
    
-   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "enlightenment/screen_setup");
-   e_configure_registry_item_add("screen/virtual_desktops", 10, _("Virtual Desktops"), NULL, "enlightenment/desktops", e_int_config_desks);
-   e_configure_registry_item_add("screen/screen_resolution", 20, _("Screen Resolution"), NULL, "enlightenment/screen_resolution", e_int_config_display);
-   e_configure_registry_item_add("screen/screen_lock", 30, _("Screen Lock"), NULL, "enlightenment/desklock", e_int_config_desklock);
-   e_configure_registry_item_add("screen/screen_saver", 40, _("Screen Saver"), NULL, "enlightenment/screensaver", e_int_config_screensaver);
-   e_configure_registry_item_add("screen/power_management", 50, _("Power Management"), NULL, "enlightenment/power_management", e_int_config_dpms);
+//   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "enlightenment/screen_setup");
+//   e_configure_registry_item_add("screen/virtual_desktops", 10, _("Virtual Desktops"), NULL, "enlightenment/desktops", e_int_config_desks);
+//   e_configure_registry_item_add("screen/screen_resolution", 20, _("Screen Resolution"), NULL, "enlightenment/screen_resolution", e_int_config_display);
+//   e_configure_registry_item_add("screen/screen_lock", 30, _("Screen Lock"), NULL, "enlightenment/desklock", e_int_config_desklock);
+//   e_configure_registry_item_add("screen/screen_saver", 40, _("Screen Saver"), NULL, "enlightenment/screensaver", e_int_config_screensaver);
+//   e_configure_registry_item_add("screen/power_management", 50, _("Power Management"), NULL, "enlightenment/power_management", e_int_config_dpms);
    
    e_configure_registry_category_add("keyboard_and_mouse", 40, _("Keyboard & Mouse"), NULL, "enlightenment/behavior");
    e_configure_registry_item_add("keyboard_and_mouse/key_bindings", 10, _("Key Bindings"), NULL, "enlightenment/keys", e_int_config_keybindings);
@@ -483,7 +483,7 @@ e_configure_init(void)
    e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
 //   e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "enlightenment/windows", e_int_config_borders_border);
 //   e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "enlightenment/windows", e_int_config_wallpaper_desk);
-   e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL, "enlightenment/windows", e_int_config_desk);
+//   e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL, "enlightenment/windows", e_int_config_desk);
 //   e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), NULL, "enlightenment/windows", e_int_config_apps_ibar_other);
 }
 
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index c1e69b521..4d86d1c4f 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -73,7 +73,6 @@
 #include "e_widget_image.h"
 #include "e_config_dialog.h"
 #include "e_int_config_focus.h"
-#include "e_int_config_desks.h"
 #include "e_int_border_locks.h"
 #include "e_thumb.h"
 #include "e_int_border_remember.h"
@@ -93,10 +92,6 @@
 #include "e_int_config_mousebindings.h"
 #include "e_int_config_performance.h"
 #include "e_int_config_winlist.h"
-#include "e_int_config_display.h"
-#include "e_int_config_desklock.h"
-#include "e_int_config_screensaver.h"
-#include "e_int_config_dpms.h"
 #include "e_int_config_exebuf.h"
 #include "e_int_config_dialogs.h"
 #include "e_int_config_mime.h"
@@ -141,7 +136,6 @@
 #include "e_filereg.h"
 #include "e_widget_aspect.h"
 #include "e_widget_desk_preview.h"
-#include "e_int_config_desk.h"
 #include "e_int_config_clientlist.h"
 #include "e_fm_prop.h"
 #include "e_mouse.h"
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index cc0017ce0..3dfb576b3 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -22,4 +22,10 @@ conf_startup \
 conf_intl \
 conf_imc \
 conf_profiles \
-conf_applications
+conf_applications \
+conf_desks \
+conf_desk \
+conf_display \
+conf_desklock \
+conf_screensaver \
+conf_dpms
diff --git a/src/modules/conf_desk/Makefile.am b/src/modules/conf_desk/Makefile.am
new file mode 100644
index 000000000..563d39707
--- /dev/null
+++ b/src/modules/conf_desk/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_desk
+
+# 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_desk.c \
+                         e_int_config_desk.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_desk/e-module-conf_desk.edj b/src/modules/conf_desk/e-module-conf_desk.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_desk/e-module-conf_desk.edj differ
diff --git a/src/bin/e_int_config_desk.c b/src/modules/conf_desk/e_int_config_desk.c
similarity index 100%
rename from src/bin/e_int_config_desk.c
rename to src/modules/conf_desk/e_int_config_desk.c
diff --git a/src/bin/e_int_config_desk.h b/src/modules/conf_desk/e_int_config_desk.h
similarity index 100%
rename from src/bin/e_int_config_desk.h
rename to src/modules/conf_desk/e_int_config_desk.h
diff --git a/src/modules/conf_desk/e_mod_main.c b/src/modules/conf_desk/e_mod_main.c
new file mode 100644
index 000000000..af2ebf566
--- /dev/null
+++ b/src/modules/conf_desk/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 - Desk"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
+   e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL, "enlightenment/windows", e_int_config_desk);
+   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_desk_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("internal/desk");
+   e_configure_registry_category_del("internal");
+   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 - Desk"),
+			_("Configuration dialog for desk."));
+   return 1;
+}
diff --git a/src/modules/conf_desk/e_mod_main.h b/src/modules/conf_desk/e_mod_main.h
new file mode 100644
index 000000000..de3c821c9
--- /dev/null
+++ b/src/modules/conf_desk/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_desk.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_desk.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_desk/module.desktop.in b/src/modules/conf_desk/module.desktop.in
new file mode 100644
index 000000000..7a6e511e8
--- /dev/null
+++ b/src/modules/conf_desk/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Desk
+Icon=e-module-conf_desk
diff --git a/src/modules/conf_desklock/Makefile.am b/src/modules/conf_desklock/Makefile.am
new file mode 100644
index 000000000..cd0307b15
--- /dev/null
+++ b/src/modules/conf_desklock/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_desklock
+
+# 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_desklock.c \
+			 e_int_config_desklock.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_desklock/e-module-conf_desklock.edj b/src/modules/conf_desklock/e-module-conf_desklock.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_desklock/e-module-conf_desklock.edj differ
diff --git a/src/bin/e_int_config_desklock.c b/src/modules/conf_desklock/e_int_config_desklock.c
similarity index 100%
rename from src/bin/e_int_config_desklock.c
rename to src/modules/conf_desklock/e_int_config_desklock.c
diff --git a/src/bin/e_int_config_desklock.h b/src/modules/conf_desklock/e_int_config_desklock.h
similarity index 100%
rename from src/bin/e_int_config_desklock.h
rename to src/modules/conf_desklock/e_int_config_desklock.h
diff --git a/src/modules/conf_desklock/e_mod_main.c b/src/modules/conf_desklock/e_mod_main.c
new file mode 100644
index 000000000..9590bce22
--- /dev/null
+++ b/src/modules/conf_desklock/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 - Screen Lock"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "enlightenment/screen_setup");
+   e_configure_registry_item_add("screen/screen_lock", 30, _("Screen Lock"), NULL, "enlightenment/desklock", e_int_config_desklock);
+   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_desklock_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("screen/screen_lock");
+   e_configure_registry_category_del("screen");
+   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 - Screen Lock"),
+			_("Configuration dialog for screen lock."));
+   return 1;
+}
diff --git a/src/modules/conf_desklock/e_mod_main.h b/src/modules/conf_desklock/e_mod_main.h
new file mode 100644
index 000000000..688e4ce59
--- /dev/null
+++ b/src/modules/conf_desklock/e_mod_main.h
@@ -0,0 +1,20 @@
+/*
+ * 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_desklock.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_desklock.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_desklock/module.desktop.in b/src/modules/conf_desklock/module.desktop.in
new file mode 100644
index 000000000..5e92f49ba
--- /dev/null
+++ b/src/modules/conf_desklock/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Screen Lock
+Icon=e-module-conf_desklock
diff --git a/src/modules/conf_desks/Makefile.am b/src/modules/conf_desks/Makefile.am
new file mode 100644
index 000000000..9e668a87c
--- /dev/null
+++ b/src/modules/conf_desks/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_desks
+
+# 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_desks.c \
+                         e_int_config_desks.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_desks/e-module-conf_desks.edj b/src/modules/conf_desks/e-module-conf_desks.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_desks/e-module-conf_desks.edj differ
diff --git a/src/bin/e_int_config_desks.c b/src/modules/conf_desks/e_int_config_desks.c
similarity index 100%
rename from src/bin/e_int_config_desks.c
rename to src/modules/conf_desks/e_int_config_desks.c
diff --git a/src/bin/e_int_config_desks.h b/src/modules/conf_desks/e_int_config_desks.h
similarity index 100%
rename from src/bin/e_int_config_desks.h
rename to src/modules/conf_desks/e_int_config_desks.h
diff --git a/src/modules/conf_desks/e_mod_main.c b/src/modules/conf_desks/e_mod_main.c
new file mode 100644
index 000000000..d0f01bbfa
--- /dev/null
+++ b/src/modules/conf_desks/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 - Virtual Desktops"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "enlightenment/screen_setup");
+   e_configure_registry_item_add("screen/virtual_desktops", 10, _("Virtual Desktops"), NULL, "enlightenment/desktops", e_int_config_desks);
+   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_desks_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("screen/virtual_desktops");
+   e_configure_registry_category_del("screen");
+   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 - Virtual Desktops"),
+			_("Configuration dialog for virtual desktops."));
+   return 1;
+}
diff --git a/src/modules/conf_desks/e_mod_main.h b/src/modules/conf_desks/e_mod_main.h
new file mode 100644
index 000000000..9a807e13f
--- /dev/null
+++ b/src/modules/conf_desks/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_desks.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_desks.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_desks/module.desktop.in b/src/modules/conf_desks/module.desktop.in
new file mode 100644
index 000000000..79f3c5a53
--- /dev/null
+++ b/src/modules/conf_desks/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Virtual Desktops
+Icon=e-module-conf_desks
diff --git a/src/modules/conf_display/Makefile.am b/src/modules/conf_display/Makefile.am
new file mode 100644
index 000000000..7bfbe9f6b
--- /dev/null
+++ b/src/modules/conf_display/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_display
+
+# 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_display.c \
+                         e_int_config_display.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_display/e-module-conf_display.edj b/src/modules/conf_display/e-module-conf_display.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_display/e-module-conf_display.edj differ
diff --git a/src/bin/e_int_config_display.c b/src/modules/conf_display/e_int_config_display.c
similarity index 100%
rename from src/bin/e_int_config_display.c
rename to src/modules/conf_display/e_int_config_display.c
diff --git a/src/bin/e_int_config_display.h b/src/modules/conf_display/e_int_config_display.h
similarity index 100%
rename from src/bin/e_int_config_display.h
rename to src/modules/conf_display/e_int_config_display.h
diff --git a/src/modules/conf_display/e_mod_main.c b/src/modules/conf_display/e_mod_main.c
new file mode 100644
index 000000000..c5031a9cd
--- /dev/null
+++ b/src/modules/conf_display/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 - Screen Resolution"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "enlightenment/screen_setup");
+   e_configure_registry_item_add("screen/screen_resolution", 20, _("Screen Resolution"), NULL, "enlightenment/screen_resolution", e_int_config_display);
+   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_display_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("screen/screen_resolution");
+   e_configure_registry_category_del("screen");
+   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 - Screen Resolution"),
+			_("Configuration dialog for screen resolution."));
+   return 1;
+}
diff --git a/src/modules/conf_display/e_mod_main.h b/src/modules/conf_display/e_mod_main.h
new file mode 100644
index 000000000..5ffdfe9cb
--- /dev/null
+++ b/src/modules/conf_display/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_display.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_display.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_display/module.desktop.in b/src/modules/conf_display/module.desktop.in
new file mode 100644
index 000000000..7f2c26284
--- /dev/null
+++ b/src/modules/conf_display/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Screen Resolution
+Icon=e-module-conf_display
diff --git a/src/modules/conf_dpms/Makefile.am b/src/modules/conf_dpms/Makefile.am
new file mode 100644
index 000000000..941a64cd4
--- /dev/null
+++ b/src/modules/conf_dpms/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_dpms
+
+# 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_dpms.c \
+                         e_int_config_dpms.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_dpms/e-module-conf_dpms.edj b/src/modules/conf_dpms/e-module-conf_dpms.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_dpms/e-module-conf_dpms.edj differ
diff --git a/src/bin/e_int_config_dpms.c b/src/modules/conf_dpms/e_int_config_dpms.c
similarity index 100%
rename from src/bin/e_int_config_dpms.c
rename to src/modules/conf_dpms/e_int_config_dpms.c
diff --git a/src/bin/e_int_config_dpms.h b/src/modules/conf_dpms/e_int_config_dpms.h
similarity index 100%
rename from src/bin/e_int_config_dpms.h
rename to src/modules/conf_dpms/e_int_config_dpms.h
diff --git a/src/modules/conf_dpms/e_mod_main.c b/src/modules/conf_dpms/e_mod_main.c
new file mode 100644
index 000000000..951edf8ff
--- /dev/null
+++ b/src/modules/conf_dpms/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 - Power Management"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "enlightenment/screen_setup");
+   e_configure_registry_item_add("screen/power_management", 50, _("Power Management"), NULL, "enlightenment/power_management", e_int_config_dpms);
+   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_dpms_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("screen/power_management");
+   e_configure_registry_category_del("screen");
+   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 - Power Management"),
+			_("Configuration dialog for power management."));
+   return 1;
+}
diff --git a/src/modules/conf_dpms/e_mod_main.h b/src/modules/conf_dpms/e_mod_main.h
new file mode 100644
index 000000000..8b6d7be38
--- /dev/null
+++ b/src/modules/conf_dpms/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_dpms.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_dpms.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_dpms/module.desktop.in b/src/modules/conf_dpms/module.desktop.in
new file mode 100644
index 000000000..1584ea546
--- /dev/null
+++ b/src/modules/conf_dpms/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Power Management
+Icon=e-module-conf_dpms
diff --git a/src/modules/conf_screensaver/Makefile.am b/src/modules/conf_screensaver/Makefile.am
new file mode 100644
index 000000000..d48d82627
--- /dev/null
+++ b/src/modules/conf_screensaver/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_screensaver
+
+# 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_screensaver.c \
+                         e_int_config_screensaver.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_screensaver/e-module-conf_screensaver.edj b/src/modules/conf_screensaver/e-module-conf_screensaver.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_screensaver/e-module-conf_screensaver.edj differ
diff --git a/src/bin/e_int_config_screensaver.c b/src/modules/conf_screensaver/e_int_config_screensaver.c
similarity index 100%
rename from src/bin/e_int_config_screensaver.c
rename to src/modules/conf_screensaver/e_int_config_screensaver.c
diff --git a/src/bin/e_int_config_screensaver.h b/src/modules/conf_screensaver/e_int_config_screensaver.h
similarity index 100%
rename from src/bin/e_int_config_screensaver.h
rename to src/modules/conf_screensaver/e_int_config_screensaver.h
diff --git a/src/modules/conf_screensaver/e_mod_main.c b/src/modules/conf_screensaver/e_mod_main.c
new file mode 100644
index 000000000..3a89d7a0c
--- /dev/null
+++ b/src/modules/conf_screensaver/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 - Screen Saver"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "enlightenment/screen_setup");
+   e_configure_registry_item_add("screen/screen_saver", 40, _("Screen Saver"), NULL, "enlightenment/screensaver", e_int_config_screensaver);
+   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_screensaver_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("screen/screen_saver");
+   e_configure_registry_category_del("screen");
+   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 - Screen Saver"),
+			_("Configuration dialog for screen saver."));
+   return 1;
+}
diff --git a/src/modules/conf_screensaver/e_mod_main.h b/src/modules/conf_screensaver/e_mod_main.h
new file mode 100644
index 000000000..696869317
--- /dev/null
+++ b/src/modules/conf_screensaver/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_screensaver.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_screensaver.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_screensaver/module.desktop.in b/src/modules/conf_screensaver/module.desktop.in
new file mode 100644
index 000000000..9eed78edb
--- /dev/null
+++ b/src/modules/conf_screensaver/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Screen Saver
+Icon=e-module-conf_screensaver