diff --git a/configure.in b/configure.in
index efc9bbabd..6c4b28682 100644
--- a/configure.in
+++ b/configure.in
@@ -288,6 +288,20 @@ src/modules/conf_screensaver/Makefile
 src/modules/conf_screensaver/module.desktop
 src/modules/conf_dpms/Makefile
 src/modules/conf_dpms/module.desktop
+src/modules/conf_shelves/Makefile
+src/modules/conf_shelves/module.desktop
+src/modules/conf_keybindings/Makefile
+src/modules/conf_keybindings/module.desktop
+src/modules/conf_mousebindings/Makefile
+src/modules/conf_mousebindings/module.desktop
+src/modules/conf_mouse/Makefile
+src/modules/conf_mouse/module.desktop
+src/modules/conf_window_display/Makefile
+src/modules/conf_window_display/module.desktop
+src/modules/conf_window_focus/Makefile
+src/modules/conf_window_focus/module.desktop
+src/modules/conf_window_manipulation/Makefile
+src/modules/conf_window_manipulation/module.desktop
 src/preload/Makefile
 data/Makefile
 data/fonts/Makefile
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 168d6b356..c70913830 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -97,7 +97,6 @@ e_widget_table.h \
 e_widget_entry.h \
 e_widget_image.h \
 e_config_dialog.h \
-e_int_config_focus.h \
 e_configure.h \
 e_int_border_locks.h \
 e_thumb.h \
@@ -113,11 +112,7 @@ e_widget_tlist.h \
 e_widget_config_list.h \
 e_slider.h \
 e_widget_slider.h \
-e_int_config_window_manipulation.h \
-e_int_config_window_display.h \
 e_int_config_menus.h \
-e_int_config_keybindings.h \
-e_int_config_mousebindings.h \
 e_int_config_performance.h \
 e_int_config_winlist.h \
 e_int_config_exebuf.h \
@@ -138,7 +133,6 @@ e_shelf.h \
 e_widget_preview.h \
 e_int_config_paths.h \
 e_int_shelf_config.h \
-e_int_config_shelf.h \
 e_int_gadcon_config.h \
 e_confirm_dialog.h \
 e_int_border_prop.h \
@@ -168,8 +162,7 @@ e_order.h \
 e_exec.h \
 e_widget_font_preview.h \
 e_fm_custom.h \
-e_fm_shared.h \
-e_int_config_mouse.h
+e_fm_shared.h
  
 enlightenment_src = \
 e_user.c \
@@ -241,7 +234,6 @@ e_widget_table.c \
 e_widget_entry.c \
 e_widget_image.c \
 e_config_dialog.c \
-e_int_config_focus.c \
 e_configure.c \
 e_int_border_locks.c \
 e_thumb.c \
@@ -257,11 +249,7 @@ e_widget_tlist.c \
 e_widget_config_list.c \
 e_slider.c \
 e_widget_slider.c \
-e_int_config_window_manipulation.c \
-e_int_config_window_display.c \
 e_int_config_menus.c \
-e_int_config_keybindings.c \
-e_int_config_mousebindings.c \
 e_int_config_performance.c \
 e_int_config_winlist.c \
 e_int_config_exebuf.c \
@@ -282,7 +270,6 @@ e_shelf.c \
 e_widget_preview.c \
 e_int_config_paths.c \
 e_int_shelf_config.c \
-e_int_config_shelf.c \
 e_int_gadcon_config.c \
 e_confirm_dialog.c \
 e_int_border_prop.c \
@@ -312,7 +299,6 @@ e_order.c \
 e_exec.c \
 e_widget_font_preview.c \
 e_fm_custom.c \
-e_int_config_mouse.c \
 $(ENLIGHTENMENTHEADERS)
 
 enlightenment_SOURCES = \
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 0be66af41..91cedd858 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -772,6 +772,13 @@ e_config_init(void)
 	CFG_MODULE("conf_desklock", 1);
 	CFG_MODULE("conf_screensaver", 1);
 	CFG_MODULE("conf_dpms", 1);
+	CFG_MODULE("conf_shelves", 1);
+	CFG_MODULE("conf_keybindings", 1);
+	CFG_MODULE("conf_mousebindings", 1);
+	CFG_MODULE("conf_mouse", 1);
+	CFG_MODULE("conf_window_display", 1);
+	CFG_MODULE("conf_window_focus", 1);
+	CFG_MODULE("conf_window_manipulation", 1);
      }
 #if 0
      {
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index 944996968..14cbf3c51 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -445,20 +445,20 @@ e_configure_init(void)
 //   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);
-   e_configure_registry_item_add("keyboard_and_mouse/mouse_bindings", 20, _("Mouse Bindings"), NULL, "enlightenment/mouse_clean", e_int_config_mousebindings);
-   e_configure_registry_item_add("keyboard_and_mouse/mouse_acceleration", 30, _("Mouse Acceleration"), NULL, "enlightenment/mouse_clean", e_int_config_mouse);
+//   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);
+//   e_configure_registry_item_add("keyboard_and_mouse/mouse_bindings", 20, _("Mouse Bindings"), NULL, "enlightenment/mouse_clean", e_int_config_mousebindings);
+//   e_configure_registry_item_add("keyboard_and_mouse/mouse_acceleration", 30, _("Mouse Acceleration"), NULL, "enlightenment/mouse_clean", e_int_config_mouse);
    
-   e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "enlightenment/windows");
-   e_configure_registry_item_add("windows/window_display", 10, _("Window Display"), NULL, "enlightenment/windows", e_int_config_window_display);
-   e_configure_registry_item_add("windows/window_focus", 20, _("Window Focus"), NULL, "enlightenment/focus", e_int_config_focus);
-   e_configure_registry_item_add("windows/window_manipulation", 30, _("Window Manipulation"), NULL, "enlightenment/window_manipulation", e_int_config_window_manipulation);
+//   e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "enlightenment/windows");
+//   e_configure_registry_item_add("windows/window_display", 10, _("Window Display"), NULL, "enlightenment/windows", e_int_config_window_display);
+//   e_configure_registry_item_add("windows/window_focus", 20, _("Window Focus"), NULL, "enlightenment/focus", e_int_config_focus);
+//   e_configure_registry_item_add("windows/window_manipulation", 30, _("Window Manipulation"), NULL, "enlightenment/window_manipulation", e_int_config_window_manipulation);
    
    e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "enlightenment/menus");
-//   e_configure_registry_item_add("menus/favorites_menu", 10, _("Favorites Menu"), NULL, "enlightenment/favorites", e_int_config_apps_favs);   
+////   e_configure_registry_item_add("menus/favorites_menu", 10, _("Favorites Menu"), NULL, "enlightenment/favorites", e_int_config_apps_favs);   
 #if 0
-//   e_configure_registry_item_add("menus/applications_menu", 20, _("Application Menus"), NULL, "enlightenment/applications", e_int_config_apps);
+////   e_configure_registry_item_add("menus/applications_menu", 20, _("Application Menus"), NULL, "enlightenment/applications", e_int_config_apps);
 #endif
    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);
@@ -473,14 +473,14 @@ e_configure_init(void)
    
    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);
-   e_configure_registry_item_add("extensions/shelves", 20, _("Shelves"), NULL, "enlightenment/shelf", e_int_config_shelf);
+//   e_configure_registry_item_add("extensions/shelves", 20, _("Shelves"), NULL, "enlightenment/shelf", e_int_config_shelf);
 
    /* internal calls - not in config dialog but accessible from other code
     * that knows these config dialogs exist and how to interact. they require
     * parameters to be passed and will not work without them being set and
     * set properly
     */
-   e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
+//   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);
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 4d86d1c4f..6cc2974d8 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -72,7 +72,6 @@
 #include "e_widget_entry.h"
 #include "e_widget_image.h"
 #include "e_config_dialog.h"
-#include "e_int_config_focus.h"
 #include "e_int_border_locks.h"
 #include "e_thumb.h"
 #include "e_int_border_remember.h"
@@ -85,11 +84,7 @@
 #include "e_widget_config_list.h"
 #include "e_slider.h"
 #include "e_widget_slider.h"
-#include "e_int_config_window_manipulation.h"
-#include "e_int_config_window_display.h"
 #include "e_int_config_menus.h"
-#include "e_int_config_keybindings.h"
-#include "e_int_config_mousebindings.h"
 #include "e_int_config_performance.h"
 #include "e_int_config_winlist.h"
 #include "e_int_config_exebuf.h"
@@ -112,7 +107,6 @@
 #include "e_widget_preview.h"
 #include "e_int_config_paths.h"
 #include "e_int_shelf_config.h"
-#include "e_int_config_shelf.h"
 #include "e_int_gadcon_config.h"
 #include "e_confirm_dialog.h"
 #include "e_int_border_prop.h"
@@ -139,7 +133,6 @@
 #include "e_int_config_clientlist.h"
 #include "e_fm_prop.h"
 #include "e_mouse.h"
-#include "e_int_config_mouse.h"
 #include "e_order.h"
 #include "e_exec.h"
 #include "e_widget_font_preview.h"
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 3dfb576b3..76f5bb71b 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -28,4 +28,11 @@ conf_desk \
 conf_display \
 conf_desklock \
 conf_screensaver \
-conf_dpms
+conf_dpms \
+conf_shelves \
+conf_keybindings \
+conf_mousebindings \
+conf_mouse \
+conf_window_display \
+conf_window_focus \
+conf_window_manipulation
diff --git a/src/modules/conf_desk/.cvsignore b/src/modules/conf_desk/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_desk/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_desklock/.cvsignore b/src/modules/conf_desklock/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_desklock/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_desks/.cvsignore b/src/modules/conf_desks/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_desks/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_display/.cvsignore b/src/modules/conf_display/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_display/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_dpms/.cvsignore b/src/modules/conf_dpms/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_dpms/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_keybindings/.cvsignore b/src/modules/conf_keybindings/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_keybindings/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_keybindings/Makefile.am b/src/modules/conf_keybindings/Makefile.am
new file mode 100644
index 000000000..c417ad63c
--- /dev/null
+++ b/src/modules/conf_keybindings/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_keybindings
+
+# 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_keybindings.c \
+                         e_int_config_keybindings.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_keybindings/e-module-conf_keybindings.edj b/src/modules/conf_keybindings/e-module-conf_keybindings.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_keybindings/e-module-conf_keybindings.edj differ
diff --git a/src/bin/e_int_config_keybindings.c b/src/modules/conf_keybindings/e_int_config_keybindings.c
similarity index 99%
rename from src/bin/e_int_config_keybindings.c
rename to src/modules/conf_keybindings/e_int_config_keybindings.c
index 30a77d67e..d0181d6ba 100644
--- a/src/bin/e_int_config_keybindings.c
+++ b/src/modules/conf_keybindings/e_int_config_keybindings.c
@@ -81,7 +81,7 @@ e_int_config_keybindings(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_keybinding_dialog")) return NULL;
+   if (e_config_dialog_find("E", "_config_keybindings_dialog")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -90,9 +90,9 @@ e_int_config_keybindings(E_Container *con, const char *params __UNUSED__)
    v->basic.create_widgets = _basic_create_widgets;
    v->override_auto_apply = 1;
 
-   cfd = e_config_dialog_new(con, _("Key Binding Settings"), "E", "_config_keybinding_dialog",
-	 "enlightenment/keys", 0, v, NULL);
-
+   cfd = e_config_dialog_new(con, _("Key Binding Settings"), "E", 
+			     "_config_keybindings_dialog",
+			     "enlightenment/keys", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/bin/e_int_config_keybindings.h b/src/modules/conf_keybindings/e_int_config_keybindings.h
similarity index 100%
rename from src/bin/e_int_config_keybindings.h
rename to src/modules/conf_keybindings/e_int_config_keybindings.h
diff --git a/src/modules/conf_keybindings/e_mod_main.c b/src/modules/conf_keybindings/e_mod_main.c
new file mode 100644
index 000000000..a76e310a7
--- /dev/null
+++ b/src/modules/conf_keybindings/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 - Key Bindings"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   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);
+   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_keybindings_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("keyboard_and_mouse/key_bindings");
+   e_configure_registry_category_del("keyboard_and_mouse");
+   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 - Key Bindings"),
+			_("Configuration dialog for key bindings."));
+   return 1;
+}
diff --git a/src/modules/conf_keybindings/e_mod_main.h b/src/modules/conf_keybindings/e_mod_main.h
new file mode 100644
index 000000000..36bf57b71
--- /dev/null
+++ b/src/modules/conf_keybindings/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_keybindings.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_keybindings.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_keybindings/module.desktop.in b/src/modules/conf_keybindings/module.desktop.in
new file mode 100644
index 000000000..df73307f3
--- /dev/null
+++ b/src/modules/conf_keybindings/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Key Bindings
+Icon=e-module-conf_keybindings
diff --git a/src/modules/conf_mouse/.cvsignore b/src/modules/conf_mouse/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_mouse/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_mouse/Makefile.am b/src/modules/conf_mouse/Makefile.am
new file mode 100644
index 000000000..4f07564ea
--- /dev/null
+++ b/src/modules/conf_mouse/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_mouse
+
+# 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_mouse.c \
+                         e_int_config_mouse.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_mouse/e-module-conf_mouse.edj b/src/modules/conf_mouse/e-module-conf_mouse.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_mouse/e-module-conf_mouse.edj differ
diff --git a/src/bin/e_int_config_mouse.c b/src/modules/conf_mouse/e_int_config_mouse.c
similarity index 100%
rename from src/bin/e_int_config_mouse.c
rename to src/modules/conf_mouse/e_int_config_mouse.c
diff --git a/src/bin/e_int_config_mouse.h b/src/modules/conf_mouse/e_int_config_mouse.h
similarity index 100%
rename from src/bin/e_int_config_mouse.h
rename to src/modules/conf_mouse/e_int_config_mouse.h
diff --git a/src/modules/conf_mouse/e_mod_main.c b/src/modules/conf_mouse/e_mod_main.c
new file mode 100644
index 000000000..4a8f0bc88
--- /dev/null
+++ b/src/modules/conf_mouse/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 - Mouse Acceleration"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Keyboard & Mouse"), NULL, "enlightenment/behavior");
+   e_configure_registry_item_add("keyboard_and_mouse/mouse_acceleration", 30, _("Mouse Acceleration"), NULL, "enlightenment/mouse_clean", e_int_config_mouse);
+   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_mouse_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("keyboard_and_mouse/mouse_acceleration");
+   e_configure_registry_category_del("keyboard_and_mouse");
+   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 - Mouse Acceleration"),
+			_("Configuration dialog for mouse acceleration."));
+   return 1;
+}
diff --git a/src/modules/conf_mouse/e_mod_main.h b/src/modules/conf_mouse/e_mod_main.h
new file mode 100644
index 000000000..2c5cd779e
--- /dev/null
+++ b/src/modules/conf_mouse/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_mouse.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_mouse.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_mouse/module.desktop.in b/src/modules/conf_mouse/module.desktop.in
new file mode 100644
index 000000000..1bc72936d
--- /dev/null
+++ b/src/modules/conf_mouse/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Mouse Acceleration
+Icon=e-module-conf_mouse
diff --git a/src/modules/conf_mousebindings/.cvsignore b/src/modules/conf_mousebindings/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_mousebindings/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_mousebindings/Makefile.am b/src/modules/conf_mousebindings/Makefile.am
new file mode 100644
index 000000000..6c152c028
--- /dev/null
+++ b/src/modules/conf_mousebindings/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_mousebindings
+
+# 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_mousebindings.c \
+                         e_int_config_mousebindings.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_mousebindings/e-module-conf_mousebindings.edj b/src/modules/conf_mousebindings/e-module-conf_mousebindings.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_mousebindings/e-module-conf_mousebindings.edj differ
diff --git a/src/bin/e_int_config_mousebindings.c b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
similarity index 100%
rename from src/bin/e_int_config_mousebindings.c
rename to src/modules/conf_mousebindings/e_int_config_mousebindings.c
diff --git a/src/bin/e_int_config_mousebindings.h b/src/modules/conf_mousebindings/e_int_config_mousebindings.h
similarity index 100%
rename from src/bin/e_int_config_mousebindings.h
rename to src/modules/conf_mousebindings/e_int_config_mousebindings.h
diff --git a/src/modules/conf_mousebindings/e_mod_main.c b/src/modules/conf_mousebindings/e_mod_main.c
new file mode 100644
index 000000000..49af253e1
--- /dev/null
+++ b/src/modules/conf_mousebindings/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 - Mouse Bindings"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Keyboard & Mouse"), NULL, "enlightenment/behavior");
+   e_configure_registry_item_add("keyboard_and_mouse/mouse_bindings", 20, _("Mouse Bindings"), NULL, "enlightenment/mouse_clean", e_int_config_mousebindings);
+   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_mousebindings_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("keyboard_and_mouse/mouse_bindings");
+   e_configure_registry_category_del("keyboard_and_mouse");
+   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 - Mouse Bindings"),
+			_("Configuration dialog for mouse bindings."));
+   return 1;
+}
diff --git a/src/modules/conf_mousebindings/e_mod_main.h b/src/modules/conf_mousebindings/e_mod_main.h
new file mode 100644
index 000000000..05b894122
--- /dev/null
+++ b/src/modules/conf_mousebindings/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_mousebindings.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_mousebindings.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_mousebindings/module.desktop.in b/src/modules/conf_mousebindings/module.desktop.in
new file mode 100644
index 000000000..24a5e4b8a
--- /dev/null
+++ b/src/modules/conf_mousebindings/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Mouse Bindings
+Icon=e-module-conf_mousebindings
diff --git a/src/modules/conf_screensaver/.cvsignore b/src/modules/conf_screensaver/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_screensaver/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_shelves/.cvsignore b/src/modules/conf_shelves/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_shelves/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_shelves/Makefile.am b/src/modules/conf_shelves/Makefile.am
new file mode 100644
index 000000000..8a3b3893e
--- /dev/null
+++ b/src/modules/conf_shelves/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_shelves
+
+# 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_shelf.c \
+                         e_int_config_shelf.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_shelves/e-module-conf_shelves.edj b/src/modules/conf_shelves/e-module-conf_shelves.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_shelves/e-module-conf_shelves.edj differ
diff --git a/src/bin/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c
similarity index 100%
rename from src/bin/e_int_config_shelf.c
rename to src/modules/conf_shelves/e_int_config_shelf.c
diff --git a/src/bin/e_int_config_shelf.h b/src/modules/conf_shelves/e_int_config_shelf.h
similarity index 100%
rename from src/bin/e_int_config_shelf.h
rename to src/modules/conf_shelves/e_int_config_shelf.h
diff --git a/src/modules/conf_shelves/e_mod_main.c b/src/modules/conf_shelves/e_mod_main.c
new file mode 100644
index 000000000..01575dc29
--- /dev/null
+++ b/src/modules/conf_shelves/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 - Shelves"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "enlightenment/extensions");
+   e_configure_registry_item_add("extensions/shelves", 20, _("Shelves"), NULL, "enlightenment/shelf", e_int_config_shelf);
+   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_shelf_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("extensions/shelves");
+   e_configure_registry_category_del("extensions");
+   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 - Shelves"),
+			_("Configuration dialog for shelves."));
+   return 1;
+}
diff --git a/src/modules/conf_shelves/e_mod_main.h b/src/modules/conf_shelves/e_mod_main.h
new file mode 100644
index 000000000..769cbf1a2
--- /dev/null
+++ b/src/modules/conf_shelves/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_shelf.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_shelf.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_shelves/module.desktop.in b/src/modules/conf_shelves/module.desktop.in
new file mode 100644
index 000000000..733eba9f4
--- /dev/null
+++ b/src/modules/conf_shelves/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Shelves
+Icon=e-module-conf_shelves
diff --git a/src/modules/conf_window_display/.cvsignore b/src/modules/conf_window_display/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_window_display/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_window_display/Makefile.am b/src/modules/conf_window_display/Makefile.am
new file mode 100644
index 000000000..58506a036
--- /dev/null
+++ b/src/modules/conf_window_display/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_window_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_window_display.c \
+                         e_int_config_window_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_window_display/e-module-conf_window_display.edj b/src/modules/conf_window_display/e-module-conf_window_display.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_window_display/e-module-conf_window_display.edj differ
diff --git a/src/bin/e_int_config_window_display.c b/src/modules/conf_window_display/e_int_config_window_display.c
similarity index 100%
rename from src/bin/e_int_config_window_display.c
rename to src/modules/conf_window_display/e_int_config_window_display.c
diff --git a/src/bin/e_int_config_window_display.h b/src/modules/conf_window_display/e_int_config_window_display.h
similarity index 100%
rename from src/bin/e_int_config_window_display.h
rename to src/modules/conf_window_display/e_int_config_window_display.h
diff --git a/src/modules/conf_window_display/e_mod_main.c b/src/modules/conf_window_display/e_mod_main.c
new file mode 100644
index 000000000..bac4c4e44
--- /dev/null
+++ b/src/modules/conf_window_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 - Window Display"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "enlightenment/windows");
+   e_configure_registry_item_add("windows/window_display", 10, _("Window Display"), NULL, "enlightenment/windows", e_int_config_window_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_window_display_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("windows/window_display");
+   e_configure_registry_category_del("windows");
+   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 Display"),
+			_("Configuration dialog for window display."));
+   return 1;
+}
diff --git a/src/modules/conf_window_display/e_mod_main.h b/src/modules/conf_window_display/e_mod_main.h
new file mode 100644
index 000000000..8877c6bb9
--- /dev/null
+++ b/src/modules/conf_window_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_window_display.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_window_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_window_display/module.desktop.in b/src/modules/conf_window_display/module.desktop.in
new file mode 100644
index 000000000..de23ec09f
--- /dev/null
+++ b/src/modules/conf_window_display/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Window Display
+Icon=e-module-conf_window_display
diff --git a/src/modules/conf_window_focus/.cvsignore b/src/modules/conf_window_focus/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_window_focus/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_window_focus/Makefile.am b/src/modules/conf_window_focus/Makefile.am
new file mode 100644
index 000000000..e746f9a86
--- /dev/null
+++ b/src/modules/conf_window_focus/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_window_focus
+
+# 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_focus.c \
+                         e_int_config_focus.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_window_focus/e-module-conf_window_focus.edj b/src/modules/conf_window_focus/e-module-conf_window_focus.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_window_focus/e-module-conf_window_focus.edj differ
diff --git a/src/bin/e_int_config_focus.c b/src/modules/conf_window_focus/e_int_config_focus.c
similarity index 100%
rename from src/bin/e_int_config_focus.c
rename to src/modules/conf_window_focus/e_int_config_focus.c
diff --git a/src/bin/e_int_config_focus.h b/src/modules/conf_window_focus/e_int_config_focus.h
similarity index 100%
rename from src/bin/e_int_config_focus.h
rename to src/modules/conf_window_focus/e_int_config_focus.h
diff --git a/src/modules/conf_window_focus/e_mod_main.c b/src/modules/conf_window_focus/e_mod_main.c
new file mode 100644
index 000000000..be5f8cfed
--- /dev/null
+++ b/src/modules/conf_window_focus/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 Focus"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "enlightenment/windows");
+   e_configure_registry_item_add("windows/window_focus", 20, _("Window Focus"), NULL, "enlightenment/focus", e_int_config_focus);
+   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_focus_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("windows/window_focus");
+   e_configure_registry_category_del("windows");
+   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 Focus"),
+			_("Configuration dialog for window focus."));
+   return 1;
+}
diff --git a/src/modules/conf_window_focus/e_mod_main.h b/src/modules/conf_window_focus/e_mod_main.h
new file mode 100644
index 000000000..aa16ea971
--- /dev/null
+++ b/src/modules/conf_window_focus/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_focus.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_focus.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_window_focus/module.desktop.in b/src/modules/conf_window_focus/module.desktop.in
new file mode 100644
index 000000000..77e54818a
--- /dev/null
+++ b/src/modules/conf_window_focus/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Window Focus
+Icon=e-module-conf_window_focus
diff --git a/src/modules/conf_window_manipulation/.cvsignore b/src/modules/conf_window_manipulation/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_window_manipulation/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_window_manipulation/Makefile.am b/src/modules/conf_window_manipulation/Makefile.am
new file mode 100644
index 000000000..986c09505
--- /dev/null
+++ b/src/modules/conf_window_manipulation/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_window_manipulation
+
+# 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_window_manipulation.c \
+                         e_int_config_window_manipulation.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_window_manipulation/e-module-conf_window_manipulation.edj b/src/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj differ
diff --git a/src/bin/e_int_config_window_manipulation.c b/src/modules/conf_window_manipulation/e_int_config_window_manipulation.c
similarity index 100%
rename from src/bin/e_int_config_window_manipulation.c
rename to src/modules/conf_window_manipulation/e_int_config_window_manipulation.c
diff --git a/src/bin/e_int_config_window_manipulation.h b/src/modules/conf_window_manipulation/e_int_config_window_manipulation.h
similarity index 100%
rename from src/bin/e_int_config_window_manipulation.h
rename to src/modules/conf_window_manipulation/e_int_config_window_manipulation.h
diff --git a/src/modules/conf_window_manipulation/e_mod_main.c b/src/modules/conf_window_manipulation/e_mod_main.c
new file mode 100644
index 000000000..69f64cdac
--- /dev/null
+++ b/src/modules/conf_window_manipulation/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 Manipulation"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "enlightenment/windows");
+   e_configure_registry_item_add("windows/window_manipulation", 30, _("Window Manipulation"), NULL, "enlightenment/window_manipulation", e_int_config_window_manipulation);
+   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_window_manipulation_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("windows/window_manipulation");
+   e_configure_registry_category_del("windows");
+   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 Manipulation"),
+			_("Configuration dialog for window manipulation."));
+   return 1;
+}
diff --git a/src/modules/conf_window_manipulation/e_mod_main.h b/src/modules/conf_window_manipulation/e_mod_main.h
new file mode 100644
index 000000000..9d5e64916
--- /dev/null
+++ b/src/modules/conf_window_manipulation/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_window_manipulation.h"
+
+#undef E_TYPEDEFS
+#include "e_int_config_window_manipulation.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_window_manipulation/module.desktop.in b/src/modules/conf_window_manipulation/module.desktop.in
new file mode 100644
index 000000000..ddc4bb9df
--- /dev/null
+++ b/src/modules/conf_window_manipulation/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Window Manipulation
+Icon=e-module-conf_window_manipulation